From 437ca91b9441dc5891b39f81301b2c2af0989bf3 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 19 Oct 2020 17:15:35 +0900
Subject: [PATCH] Use DI to open the copy rather than passing in an ugly action

---
 .../Screens/Multi/Lounge/Components/DrawableRoom.cs   | 10 +++++++---
 .../Screens/Multi/Lounge/Components/RoomsContainer.cs |  8 --------
 osu.Game/Screens/Multi/Multiplayer.cs                 | 11 ++++++-----
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index db75df6054..01a85382e4 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -38,11 +38,12 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         public event Action<SelectionState> StateChanged;
 
-        public Action DuplicateRoom;
-
         private readonly Box selectionBox;
         private CachedModelDependencyContainer<Room> dependencies;
 
+        [Resolved(canBeNull: true)]
+        private Multiplayer multiplayer { get; set; }
+
         [Resolved]
         private BeatmapManager beatmaps { get; set; }
 
@@ -239,7 +240,10 @@ namespace osu.Game.Screens.Multi.Lounge.Components
 
         public MenuItem[] ContextMenuItems => new MenuItem[]
         {
-            new OsuMenuItem("Create copy", MenuItemType.Standard, DuplicateRoom)
+            new OsuMenuItem("Create copy", MenuItemType.Standard, () =>
+            {
+                multiplayer?.CreateRoom(Room.CreateCopy());
+            })
         };
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index d9af38d19e..60c6aa1d8a 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -111,14 +111,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             {
                 roomFlow.Add(new DrawableRoom(room)
                 {
-                    DuplicateRoom = () =>
-                    {
-                        Room newRoom = room.CreateCopy();
-                        if (!newRoom.Name.Value.StartsWith("Copy of "))
-                            newRoom.Name.Value = $"Copy of {room.Name.Value}";
-
-                        loungeSubScreen?.Open(newRoom);
-                    },
                     Action = () =>
                     {
                         if (room == selectedRoom.Value)
diff --git a/osu.Game/Screens/Multi/Multiplayer.cs b/osu.Game/Screens/Multi/Multiplayer.cs
index cdaeebefb7..27f774e9ec 100644
--- a/osu.Game/Screens/Multi/Multiplayer.cs
+++ b/osu.Game/Screens/Multi/Multiplayer.cs
@@ -134,7 +134,7 @@ namespace osu.Game.Screens.Multi
                     {
                         Anchor = Anchor.TopRight,
                         Origin = Anchor.TopRight,
-                        Action = createRoom
+                        Action = () => CreateRoom()
                     },
                     roomManager = new RoomManager()
                 }
@@ -289,10 +289,11 @@ namespace osu.Game.Screens.Multi
             logo.Delay(WaveContainer.DISAPPEAR_DURATION / 2).FadeOut();
         }
 
-        private void createRoom()
-        {
-            loungeSubScreen.Open(new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } });
-        }
+        /// <summary>
+        /// Create a new room.
+        /// </summary>
+        /// <param name="room">An optional template to use when creating the room.</param>
+        public void CreateRoom(Room room = null) => loungeSubScreen.Open(room ?? new Room { Name = { Value = $"{api.LocalUser}'s awesome room" } });
 
         private void beginHandlingTrack()
         {