From e59ac9e7c8e7af67e955c82865c5b422e21c8964 Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Fri, 22 Nov 2024 17:19:26 +0900
Subject: [PATCH] No longer remove expired playlist items from `Room` model

---
 osu.Game/Online/Rooms/Room.cs                         | 11 -----------
 .../OnlinePlay/Components/ListingPollingComponent.cs  |  3 ---
 .../Components/SelectionPollingComponent.cs           |  1 -
 3 files changed, 15 deletions(-)

diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
index 486f70c0ed..729074c5b6 100644
--- a/osu.Game/Online/Rooms/Room.cs
+++ b/osu.Game/Online/Rooms/Room.cs
@@ -388,21 +388,10 @@ namespace osu.Game.Online.Rooms
             CurrentPlaylistItem = other.CurrentPlaylistItem;
             AutoSkip = other.AutoSkip;
 
-            other.RemoveExpiredPlaylistItems();
-
             Playlist = other.Playlist;
             RecentParticipants = other.RecentParticipants;
         }
 
-        public void RemoveExpiredPlaylistItems()
-        {
-            // Todo: This is not the best way/place to do this, but the intention is to display all playlist items when the room has ended,
-            // and display only the non-expired playlist items while the room is still active. In order to achieve this, all expired items are removed from the source Room.
-            // More refactoring is required before this can be done locally instead - DrawableRoomPlaylist is currently directly bound to the playlist to display items in the room.
-            if (Status is not RoomStatusEnded)
-                Playlist = Playlist.Where(i => !i.Expired).ToArray();
-        }
-
         [JsonObject(MemberSerialization.OptIn)]
         public class RoomPlaylistItemStats
         {
diff --git a/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
index b10ce8ed1b..b213d424df 100644
--- a/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
@@ -60,10 +60,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
                 }
 
                 foreach (var incoming in result)
-                {
-                    incoming.RemoveExpiredPlaylistItems();
                     RoomManager.AddOrUpdateRoom(incoming);
-                }
 
                 initialRoomsReceived.Value = true;
                 tcs.SetResult(true);
diff --git a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
index 8b80228ae1..7cee8b3546 100644
--- a/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
+++ b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
@@ -36,7 +36,6 @@ namespace osu.Game.Screens.OnlinePlay.Components
 
             req.Success += result =>
             {
-                result.RemoveExpiredPlaylistItems();
                 RoomManager.AddOrUpdateRoom(result);
                 tcs.SetResult(true);
             };