Merge pull request ppy#30830 from smoogipoo/multiplayer-remove-expire…

…d-item-removal No longer remove expired playlist items from `Room` model
vunyunt · Nov 24, 2024 · 354bc42 · 354bc42
2 parents 7a973b0 956da03
commit 354bc42
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 21 deletions.
diff --git a/osu.Game/Online/Rooms/Room.cs b/osu.Game/Online/Rooms/Room.cs
@@ -366,12  366,8 @@ public void CopyFrom(Room other)
         {
             RoomID = other.RoomID;
             Name = other.Name;
-
             Category = other.Category;
-
-            if (other.Host != null && Host?.Id != other.Host.Id)
-                Host = other.Host;
-
             Host = other.Host;
             ChannelId = other.ChannelId;
             Status = other.Status;
             Availability = other.Availability;
@@ -387,22  383,10 @@ public void CopyFrom(Room other)
             PlaylistItemStats = other.PlaylistItemStats;
             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
@@ -60,10  60,7 @@ protected override Task Poll()
                 }
 
                 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
@@ -36,7  36,6 @@ protected override Task Poll()
 
             req.Success  = result =>
             {
-                result.RemoveExpiredPlaylistItems();
                 RoomManager.AddOrUpdateRoom(result);
                 tcs.SetResult(true);
             };