Merge branch 'master' into fix-multiplayer-mod-propagation-race

osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs

@@ -69,6 +69,20 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddAssert("last room joined", () => RoomManager.Rooms.Last().Status.Value is JoinedRoomStatus);
         }
 
+        [Test]
+        public void TestClickDeselection()
+        {
+            AddRooms(1);
+
+            AddAssert("no selection", () => checkRoomSelected(null));
+
+            press(Key.Down);
+            AddAssert("first room selected", () => checkRoomSelected(RoomManager.Rooms.First()));
+
+            AddStep("click away", () => InputManager.Click(MouseButton.Left));
+            AddAssert("no selection", () => checkRoomSelected(null));
+        }
+
         private void press(Key down)
         {
             AddStep($"press {down}", () => InputManager.Key(down));

osu.Game/Online/API/Requests/Responses/APIUserScoreAggregate.cs

@@ -22,7 +22,7 @@ namespace osu.Game.Online.API.Requests.Responses
         public double? PP { get; set; }
 
         [JsonProperty(@"room_id")]
-        public int RoomID { get; set; }
+        public long RoomID { get; set; }
 
         [JsonProperty("total_score")]
         public long TotalScore { get; set; }

osu.Game/Online/Multiplayer/StatefulMultiplayerClient.cs

@@ -95,7 +95,7 @@ namespace osu.Game.Online.Multiplayer
         private Room? apiRoom;
 
         // Todo: This is temporary, until the multiplayer server returns the item id on match start or otherwise.
-        private int playlistItemId;
+        private long playlistItemId;
 
         [BackgroundDependencyLoader]
         private void load()

osu.Game/Online/Rooms/CreateRoomScoreRequest.cs

@@ -9,11 +9,11 @@ namespace osu.Game.Online.Rooms
 {
     public class CreateRoomScoreRequest : APIRequest<APIScoreToken>
     {
-        private readonly int roomId;
-        private readonly int playlistItemId;
+        private readonly long roomId;
+        private readonly long playlistItemId;
         private readonly string versionHash;
 
-        public CreateRoomScoreRequest(int roomId, int playlistItemId, string versionHash)
+        public CreateRoomScoreRequest(long roomId, long playlistItemId, string versionHash)
         {
             this.roomId = roomId;
             this.playlistItemId = playlistItemId;

osu.Game/Online/Rooms/GetRoomLeaderboardRequest.cs

@@ -7,9 +7,9 @@ namespace osu.Game.Online.Rooms
 {
     public class GetRoomLeaderboardRequest : APIRequest<APILeaderboard>
     {
-        private readonly int roomId;
+        private readonly long roomId;
 
-        public GetRoomLeaderboardRequest(int roomId)
+        public GetRoomLeaderboardRequest(long roomId)
         {
             this.roomId = roomId;
         }

osu.Game/Online/Rooms/GetRoomRequest.cs

@@ -7,9 +7,9 @@ namespace osu.Game.Online.Rooms
 {
     public class GetRoomRequest : APIRequest<Room>
     {
-        public readonly int RoomId;
+        public readonly long RoomId;
 
-        public GetRoomRequest(int roomId)
+        public GetRoomRequest(long roomId)
         {
             RoomId = roomId;
         }

osu.Game/Online/Rooms/IndexPlaylistScoresRequest.cs

@@ -15,8 +15,8 @@ namespace osu.Game.Online.Rooms
     /// </summary>
     public class IndexPlaylistScoresRequest : APIRequest<IndexedMultiplayerScores>
     {
-        public readonly int RoomId;
-        public readonly int PlaylistItemId;
+        public readonly long RoomId;
+        public readonly long PlaylistItemId;
 
         [CanBeNull]
         public readonly Cursor Cursor;
@@ -24,13 +24,13 @@ namespace osu.Game.Online.Rooms
         [CanBeNull]
         public readonly IndexScoresParams IndexParams;
 
-        public IndexPlaylistScoresRequest(int roomId, int playlistItemId)
+        public IndexPlaylistScoresRequest(long roomId, long playlistItemId)
         {
             RoomId = roomId;
             PlaylistItemId = playlistItemId;
         }
 
-        public IndexPlaylistScoresRequest(int roomId, int playlistItemId, [NotNull] Cursor cursor, [NotNull] IndexScoresParams indexParams)
+        public IndexPlaylistScoresRequest(long roomId, long playlistItemId, [NotNull] Cursor cursor, [NotNull] IndexScoresParams indexParams)
             : this(roomId, playlistItemId)
         {
             Cursor = cursor;

osu.Game/Online/Rooms/ItemAttemptsCount.cs

@@ -0,0 +1,19 @@
+// 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;
+
+namespace osu.Game.Online.Rooms
+{
+    /// <summary>
+    /// Represents attempts on a specific playlist item.
+    /// </summary>
+    public class ItemAttemptsCount
+    {
+        [JsonProperty("id")]
+        public int PlaylistItemID { get; set; }
+
+        [JsonProperty("attempts")]
+        public int Attempts { get; set; }
+    }
+}

osu.Game/Online/Rooms/MultiplayerScore.cs

@@ -18,7 +18,7 @@ namespace osu.Game.Online.Rooms
     public class MultiplayerScore
     {
         [JsonProperty("id")]
-        public int ID { get; set; }
+        public long ID { get; set; }
 
         [JsonProperty("user")]
         public User User { get; set; }

osu.Game/Online/Rooms/PlaylistAggregateScore.cs

@@ -0,0 +1,16 @@
+// 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;
+
+namespace osu.Game.Online.Rooms
+{
+    /// <summary>
+    /// Represents aggregated score for the local user for a playlist.
+    /// </summary>
+    public class PlaylistAggregateScore
+    {
+        [JsonProperty("playlist_item_attempts")]
+        public ItemAttemptsCount[] PlaylistItemAttempts { get; set; }
+    }
+}

osu.Game/Online/Rooms/PlaylistItem.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Online.Rooms
     public class PlaylistItem : IEquatable<PlaylistItem>
     {
         [JsonProperty("id")]
-        public int ID { get; set; }
+        public long ID { get; set; }
 
         [JsonProperty("beatmap_id")]
         public int BeatmapID { get; set; }

osu.Game/Online/Rooms/Room.cs

@@ -17,7 +17,7 @@ namespace osu.Game.Online.Rooms
     {
         [Cached]
         [JsonProperty("id")]
-        public readonly Bindable<int?> RoomID = new Bindable<int?>();
+        public readonly Bindable<long?> RoomID = new Bindable<long?>();
 
         [Cached]
         [JsonProperty("name")]
@@ -72,6 +72,10 @@ namespace osu.Game.Online.Rooms
         [JsonIgnore]
         public readonly Bindable<int?> MaxParticipants = new Bindable<int?>();
 
+        [Cached]
+        [JsonProperty("current_user_score")]
+        public readonly Bindable<PlaylistAggregateScore> UserScore = new Bindable<PlaylistAggregateScore>();
+
         [Cached]
         [JsonProperty("recent_participants")]
         public readonly BindableList<User> RecentParticipants = new BindableList<User>();
@@ -144,6 +148,7 @@ namespace osu.Game.Online.Rooms
             MaxParticipants.Value = other.MaxParticipants.Value;
             ParticipantCount.Value = other.ParticipantCount.Value;
             EndDate.Value = other.EndDate.Value;
+            UserScore.Value = other.UserScore.Value;
 
             if (EndDate.Value != null && DateTimeOffset.Now >= EndDate.Value)
                 Status.Value = new RoomStatusEnded();

osu.Game/Online/Rooms/ShowPlaylistUserScoreRequest.cs

@@ -7,11 +7,11 @@ namespace osu.Game.Online.Rooms
 {
     public class ShowPlaylistUserScoreRequest : APIRequest<MultiplayerScore>
     {
-        private readonly int roomId;
-        private readonly int playlistItemId;
+        private readonly long roomId;
+        private readonly long playlistItemId;
         private readonly long userId;
 
-        public ShowPlaylistUserScoreRequest(int roomId, int playlistItemId, long userId)
+        public ShowPlaylistUserScoreRequest(long roomId, long playlistItemId, long userId)
         {
             this.roomId = roomId;
             this.playlistItemId = playlistItemId;

osu.Game/Online/Rooms/SubmitRoomScoreRequest.cs

@@ -11,12 +11,12 @@ namespace osu.Game.Online.Rooms
 {
     public class SubmitRoomScoreRequest : APIRequest<MultiplayerScore>
     {
-        private readonly int scoreId;
-        private readonly int roomId;
-        private readonly int playlistItemId;
+        private readonly long scoreId;
+        private readonly long roomId;
+        private readonly long playlistItemId;
         private readonly ScoreInfo scoreInfo;
 
-        public SubmitRoomScoreRequest(int scoreId, int roomId, int playlistItemId, ScoreInfo scoreInfo)
+        public SubmitRoomScoreRequest(long scoreId, long roomId, long playlistItemId, ScoreInfo scoreInfo)
         {
             this.scoreId = scoreId;
             this.roomId = roomId;

osu.Game/Overlays/Comments/DrawableComment.cs

@@ -9,7 +9,6 @@ using osuTK;
 using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Users.Drawables;
 using osu.Game.Graphics.Containers;
-using osu.Game.Utils;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Bindables;
 using System.Linq;
@@ -245,11 +244,32 @@ namespace osu.Game.Overlays.Comments
 
             if (Comment.EditedAt.HasValue)
             {
-                info.Add(new OsuSpriteText
+                var font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular);
+                var colour = colourProvider.Foreground1;
+
+                info.Add(new FillFlowContainer
                 {
-                    Font = OsuFont.GetFont(size: 12, weight: FontWeight.Regular),
-                    Text = $@"edited {HumanizerUtils.Humanize(Comment.EditedAt.Value)} by {Comment.EditedUser.Username}",
-                    Colour = colourProvider.Foreground1
+                    AutoSizeAxes = Axes.Both,
+                    Children = new Drawable[]
+                    {
+                        new OsuSpriteText
+                        {
+                            Font = font,
+                            Text = "edited ",
+                            Colour = colour
+                        },
+                        new DrawableDate(Comment.EditedAt.Value)
+                        {
+                            Font = font,
+                            Colour = colour
+                        },
+                        new OsuSpriteText
+                        {
+                            Font = font,
+                            Text = $@" by {Comment.EditedUser.Username}",
+                            Colour = colour
+                        },
+                    }
                 });
             }
 

osu.Game/Screens/OnlinePlay/Components/RoomLocalUserInfo.cs

@@ -1,6 +1,7 @@
 // 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 System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -39,12 +40,26 @@ namespace osu.Game.Screens.OnlinePlay.Components
         {
             base.LoadComplete();
 
-            MaxAttempts.BindValueChanged(attempts =>
+            MaxAttempts.BindValueChanged(_ => updateAttempts());
+            UserScore.BindValueChanged(_ => updateAttempts(), true);
+        }
+
+        private void updateAttempts()
+        {
+            if (MaxAttempts.Value != null)
             {
-                attemptDisplay.Text = attempts.NewValue == null
-                    ? string.Empty
-                    : $"Maximum attempts: {attempts.NewValue:N0}";
-            }, true);
+                attemptDisplay.Text = $"Maximum attempts: {MaxAttempts.Value:N0}";
+
+                if (UserScore.Value != null)
+                {
+                    int remaining = MaxAttempts.Value.Value - UserScore.Value.PlaylistItemAttempts.Sum(a => a.Attempts);
+                    attemptDisplay.Text += $" ({remaining} remaining)";
+                }
+            }
+            else
+            {
+                attemptDisplay.Text = string.Empty;
+            }
         }
     }
 }

osu.Game/Screens/OnlinePlay/Components/RoomManager.cs

@@ -116,7 +116,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
             joinedRoom.Value = null;
         }
 
-        private readonly HashSet<int> ignoredRooms = new HashSet<int>();
+        private readonly HashSet<long> ignoredRooms = new HashSet<long>();
 
         private void onRoomsReceived(List<Room> received)
         {

osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs

@@ -11,6 +11,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Input.Events;
 using osu.Framework.Threading;
 using osu.Game.Extensions;
 using osu.Game.Graphics.Cursor;
@@ -42,6 +43,9 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
         [Resolved(CanBeNull = true)]
         private LoungeSubScreen loungeSubScreen { get; set; }
 
+        // handle deselection
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
+
         public RoomsContainer()
         {
             RelativeSizeAxes = Axes.X;
@@ -69,8 +73,16 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             rooms.BindTo(roomManager.Rooms);
 
             filter?.BindValueChanged(criteria => Filter(criteria.NewValue));
+
+            selectedRoom.BindValueChanged(selection =>
+            {
+                updateSelection();
+            }, true);
         }
 
+        private void updateSelection() =>
+            roomFlow.Children.ForEach(r => r.State = r.Room == selectedRoom.Value ? SelectionState.Selected : SelectionState.NotSelected);
+
         public void Filter(FilterCriteria criteria)
         {
             roomFlow.Children.ForEach(r =>
@@ -125,6 +137,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             }
 
             Filter(filter?.Value);
+
+            updateSelection();
         }
 
         private void removeRooms(IEnumerable<Room> rooms)
@@ -146,11 +160,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                 roomFlow.SetLayoutPosition(room, room.Room.Position.Value);
         }
 
-        private void selectRoom(Room room)
-        {
-            roomFlow.Children.ForEach(r => r.State = r.Room == room ? SelectionState.Selected : SelectionState.NotSelected);
-            selectedRoom.Value = room;
-        }
+        private void selectRoom(Room room) => selectedRoom.Value = room;
 
         private void joinSelected()
         {
@@ -159,6 +169,12 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
             JoinRequested?.Invoke(selectedRoom.Value);
         }
 
+        protected override bool OnClick(ClickEvent e)
+        {
+            selectRoom(null);
+            return base.OnClick(e);
+        }
+
         #region Key selection logic (shared with BeatmapCarousel)
 
         public bool OnPressed(GlobalAction action)

osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs

@@ -11,7 +11,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
     public class MatchChatDisplay : StandAloneChatDisplay
     {
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
+        private Bindable<long?> roomId { get; set; }
 
         [Resolved(typeof(Room), nameof(Room.ChannelId))]
         private Bindable<int> channelId { get; set; }

osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
     public class MatchLeaderboard : Leaderboard<MatchLeaderboardScope, APIUserScoreAggregate>
     {
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
+        private Bindable<long?> roomId { get; set; }
 
         [BackgroundDependencyLoader]
         private void load()

osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs

@@ -357,7 +357,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
         public class CreateOrUpdateButton : TriangleButton
         {
             [Resolved(typeof(Room), nameof(Room.RoomID))]
-            private Bindable<int?> roomId { get; set; }
+            private Bindable<long?> roomId { get; set; }
 
             protected override void LoadComplete()
             {

osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs

@@ -9,7 +9,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 {
     public class MultiplayerResultsScreen : PlaylistsResultsScreen
     {
-        public MultiplayerResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem)
+        public MultiplayerResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem)
             : base(score, roomId, playlistItem, false, false)
         {
         }

osu.Game/Screens/OnlinePlay/OnlinePlayComposite.cs

@@ -13,7 +13,7 @@ namespace osu.Game.Screens.OnlinePlay
     public class OnlinePlayComposite : CompositeDrawable
     {
         [Resolved(typeof(Room))]
-        protected Bindable<int?> RoomID { get; private set; }
+        protected Bindable<long?> RoomID { get; private set; }
 
         [Resolved(typeof(Room), nameof(Room.Name))]
         protected Bindable<string> RoomName { get; private set; }
@@ -42,6 +42,9 @@ namespace osu.Game.Screens.OnlinePlay
         [Resolved(typeof(Room))]
         protected Bindable<int?> MaxAttempts { get; private set; }
 
+        [Resolved(typeof(Room))]
+        public Bindable<PlaylistAggregateScore> UserScore { get; private set; }
+
         [Resolved(typeof(Room))]
         protected Bindable<DateTimeOffset?> EndDate { get; private set; }
 

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs

@@ -24,7 +24,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         public Action Exited;
 
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        protected Bindable<int?> RoomId { get; private set; }
+        protected Bindable<long?> RoomId { get; private set; }
 
         protected readonly PlaylistItem PlaylistItem;
 

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs

@@ -19,7 +19,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 {
     public class PlaylistsResultsScreen : ResultsScreen
     {
-        private readonly int roomId;
+        private readonly long roomId;
         private readonly PlaylistItem playlistItem;
 
         protected LoadingSpinner LeftSpinner { get; private set; }
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         [Resolved]
         private IAPIProvider api { get; set; }
 
-        public PlaylistsResultsScreen(ScoreInfo score, int roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
+        public PlaylistsResultsScreen(ScoreInfo score, long roomId, PlaylistItem playlistItem, bool allowRetry, bool allowWatchingReplay = true)
             : base(score, allowRetry, allowWatchingReplay)
         {
             this.roomId = roomId;

osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs

@@ -25,7 +25,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
         public override string ShortTitle => "playlist";
 
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<int?> roomId { get; set; }
+        private Bindable<long?> roomId { get; set; }
 
         private MatchSettingsOverlay settingsOverlay;
         private MatchLeaderboard leaderboard;