From d7a98097a127294e740f57455a079ba92caf4364 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 22 Oct 2021 21:04:52 +0900
Subject: [PATCH] Make DrawableRoomPlaylist handle expired items

---
 .../TestSceneDrawableRoomPlaylist.cs          | 47 ++++++++++++++++++-
 .../OnlinePlay/DrawableRoomPlaylistItem.cs    |  3 ++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
index 93bdbb79f4..470c5bed59 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneDrawableRoomPlaylist.cs
@@ -241,6 +241,50 @@ namespace osu.Game.Tests.Visual.Multiplayer
             createPlaylist(beatmap);
         }
 
+        [Test]
+        public void TestExpiredItems()
+        {
+            AddStep("create playlist", () =>
+            {
+                Child = playlist = new TestPlaylist(false, false)
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Size = new Vector2(500, 300),
+                    Items =
+                    {
+                        new PlaylistItem
+                        {
+                            ID = 0,
+                            Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                            Expired = true,
+                            RequiredMods =
+                            {
+                                new OsuModHardRock(),
+                                new OsuModDoubleTime(),
+                                new OsuModAutoplay()
+                            }
+                        },
+                        new PlaylistItem
+                        {
+                            ID = 1,
+                            Beatmap = { Value = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo },
+                            Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                            RequiredMods =
+                            {
+                                new OsuModHardRock(),
+                                new OsuModDoubleTime(),
+                                new OsuModAutoplay()
+                            }
+                        }
+                    }
+                };
+            });
+
+            AddUntilStep("wait for items to load", () => playlist.ItemMap.Values.All(i => i.IsLoaded));
+        }
+
         private void moveToItem(int index, Vector2? offset = null)
             => AddStep($"move mouse to item {index}", () => InputManager.MoveMouseTo(playlist.ChildrenOfType<DifficultyIcon>().ElementAt(index), offset));
 
@@ -261,7 +305,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 () => (playlist.ChildrenOfType<OsuRearrangeableListItem<PlaylistItem>.PlaylistItemHandle>().ElementAt(index).Alpha > 0) == visible);
 
         private void assertDeleteButtonVisibility(int index, bool visible)
-            => AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible", () => (playlist.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
+            => AddAssert($"delete button {index} {(visible ? "is" : "is not")} visible",
+                () => (playlist.ChildrenOfType<DrawableRoomPlaylistItem.PlaylistRemoveButton>().ElementAt(2 + index * 2).Alpha > 0) == visible);
 
         private void createPlaylist(bool allowEdit, bool allowSelection)
         {
diff --git a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
index 9fee739048..2ee096eb8e 100644
--- a/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
+++ b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
@@ -72,6 +72,9 @@ namespace osu.Game.Screens.OnlinePlay
             requiredMods.BindTo(item.RequiredMods);
 
             ShowDragHandle.Value = allowEdit;
+
+            if (item.Expired)
+                Colour = OsuColour.Gray(0.5f);
         }
 
         [BackgroundDependencyLoader]