Merge branch 'master' into patch-1

osu.Game.Tests/Visual/Playlists/TestScenePlaylistsRoomSubScreen.cs

@@ -0,0 +1,41 @@
+// 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;
+using NUnit.Framework;
+using osu.Framework.Screens;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Rooms;
+using osu.Game.Online.Rooms.RoomStatuses;
+using osu.Game.Screens.OnlinePlay.Playlists;
+using osu.Game.Tests.Visual.OnlinePlay;
+
+namespace osu.Game.Tests.Visual.Playlists
+{
+    public partial class TestScenePlaylistsRoomSubScreen : OnlinePlayTestScene
+    {
+        protected new TestRoomManager RoomManager => (TestRoomManager)base.RoomManager;
+
+        [Test]
+        public void TestStatusUpdateOnEnter()
+        {
+            Room room = null!;
+            PlaylistsRoomSubScreen roomScreen = null!;
+
+            AddStep("create room", () =>
+            {
+                RoomManager.AddRoom(room = new Room
+                {
+                    Name = @"Test Room",
+                    Host = new APIUser { Username = @"Host" },
+                    Category = RoomCategory.Normal,
+                    EndDate = DateTimeOffset.Now.AddMinutes(-1)
+                });
+            });
+
+            AddStep("push screen", () => LoadScreen(roomScreen = new PlaylistsRoomSubScreen(room)));
+            AddUntilStep("wait for screen load", () => roomScreen.IsCurrentScreen());
+            AddAssert("status is still ended", () => roomScreen.Room.Status, Is.TypeOf<RoomStatusEnded>);
+        }
+    }
+}

osu.Game/Online/Rooms/GetRoomsRequest.cs

@@ -1,12 +1,10 @@
 // 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;
 using System.Collections.Generic;
 using osu.Framework.IO.Network;
 using osu.Game.Extensions;
 using osu.Game.Online.API;
-using osu.Game.Online.Rooms.RoomStatuses;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;
 
 namespace osu.Game.Online.Rooms
@@ -35,25 +33,6 @@ protected override WebRequest CreateWebRequest()
             return req;
         }
 
-        protected override void PostProcess()
-        {
-            base.PostProcess();
-
-            if (Response != null)
-            {
-                // API doesn't populate status so let's do it here.
-                foreach (var room in Response)
-                {
-                    if (room.EndDate != null && DateTimeOffset.Now >= room.EndDate)
-                        room.Status = new RoomStatusEnded();
-                    else if (room.HasPassword)
-                        room.Status = new RoomStatusOpenPrivate();
-                    else
-                        room.Status = new RoomStatusOpen();
-                }
-            }
-        }
-
         protected override string Target => "rooms";
     }
 }

osu.Game/Online/Rooms/Room.cs

@@ -6,6 +6,7 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Runtime.Serialization;
 using Newtonsoft.Json;
 using osu.Game.IO.Serialization.Converters;
 using osu.Game.Online.API.Requests.Responses;
@@ -264,6 +265,18 @@ public RoomAvailability Availability
             set => SetField(ref availability, value);
         }
 
+        [OnDeserialized]
+        private void onDeserialised(StreamingContext context)
+        {
+            // API doesn't populate status so let's do it here.
+            if (EndDate != null && DateTimeOffset.Now >= EndDate)
+                Status = new RoomStatusEnded();
+            else if (HasPassword)
+                Status = new RoomStatusOpenPrivate();
+            else
+                Status = new RoomStatusOpen();
+        }
+
         [JsonProperty("id")]
         private long? roomId;
 

osu.Game/Tests/Visual/OnlinePlay/TestRoomManager.cs

@@ -29,38 +29,28 @@ public void AddRooms(int count, RulesetInfo? ruleset = null, bool withPassword =
         {
             for (int i = 0; i < count; i++)
             {
-                var room = new Room
+                AddRoom(new Room
                 {
-                    RoomID = -currentRoomId,
                     Name = $@"Room {currentRoomId}",
                     Host = new APIUser { Username = @"Host" },
                     Duration = TimeSpan.FromSeconds(10),
                     Category = withSpotlightRooms && i % 2 == 0 ? RoomCategory.Spotlight : RoomCategory.Normal,
-                };
-
-                if (withPassword)
-                    room.Password = @"password";
-
-                if (ruleset != null)
-                {
-                    room.PlaylistItemStats = new Room.RoomPlaylistItemStats
-                    {
-                        RulesetIDs = new[] { ruleset.OnlineID },
-                    };
-
-                    room.Playlist =
-                    [
-                        new PlaylistItem(new BeatmapInfo { Metadata = new BeatmapMetadata() })
-                        {
-                            RulesetID = ruleset.OnlineID,
-                        }
-                    ];
-                }
-
-                CreateRoom(room);
-
-                currentRoomId++;
+                    Password = withPassword ? @"password" : null,
+                    PlaylistItemStats = ruleset == null
+                        ? null
+                        : new Room.RoomPlaylistItemStats { RulesetIDs = [ruleset.OnlineID] },
+                    Playlist = ruleset == null
+                        ? Array.Empty<PlaylistItem>()
+                        : [new PlaylistItem(new BeatmapInfo { Metadata = new BeatmapMetadata() }) { RulesetID = ruleset.OnlineID }]
+                });
             }
         }
+
+        public void AddRoom(Room room)
+        {
+            room.RoomID = -currentRoomId;
+            CreateRoom(room);
+            currentRoomId++;
+        }
     }
 }