Merge branch 'master' into fix-error-spam-on-disconnection

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs

@@ -143,7 +143,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 RoomManager =
                 {
                     TimeBetweenListingPolls = { Value = 1 },
-                    TimeBetweenSelectionPolls = { Value = 1 }
                 }
             };
 

osu.Game/Online/Multiplayer/MultiplayerRoom.cs

@@ -42,8 +42,6 @@ namespace osu.Game.Online.Multiplayer
         /// </summary>
         public MultiplayerRoomUser? Host { get; set; }
 
-        private object writeLock = new object();
-
         [JsonConstructor]
         public MultiplayerRoom(in long roomId)
         {

osu.Game/Screens/Menu/ButtonSystem.cs

@@ -156,11 +156,11 @@ namespace osu.Game.Screens.Menu
 
         private void onMultiplayer()
         {
-            if (!api.IsLoggedIn)
+            if (api.State.Value != APIState.Online)
             {
                 notifications?.Post(new SimpleNotification
                 {
-                    Text = "You gotta be logged in to multi 'yo!",
+                    Text = "You gotta be online to multi 'yo!",
                     Icon = FontAwesome.Solid.Globe,
                     Activated = () =>
                     {
@@ -177,11 +177,11 @@ namespace osu.Game.Screens.Menu
 
         private void onPlaylists()
         {
-            if (!api.IsLoggedIn)
+            if (api.State.Value != APIState.Online)
             {
                 notifications?.Post(new SimpleNotification
                 {
-                    Text = "You gotta be logged in to multi 'yo!",
+                    Text = "You gotta be online to view playlists 'yo!",
                     Icon = FontAwesome.Solid.Globe,
                     Activated = () =>
                     {

osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs

@@ -33,7 +33,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
             if (!this.IsCurrentScreen())
             {
                 multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
-                multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
             }
             else
             {
@@ -41,18 +40,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 {
                     case LoungeSubScreen _:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = isIdle ? 120000 : 15000;
-                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = isIdle ? 120000 : 15000;
                         break;
 
                     // Don't poll inside the match or anywhere else.
                     default:
                         multiplayerRoomManager.TimeBetweenListingPolls.Value = 0;
-                        multiplayerRoomManager.TimeBetweenSelectionPolls.Value = 0;
                         break;
                 }
             }
 
-            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value}, selection: {multiplayerRoomManager.TimeBetweenSelectionPolls.Value})");
+            Logger.Log($"Polling adjusted (listing: {multiplayerRoomManager.TimeBetweenListingPolls.Value})");
         }
 
         protected override Room CreateNewRoom()

osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs

@@ -23,7 +23,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         private StatefulMultiplayerClient multiplayerClient { get; set; }
 
         public readonly Bindable<double> TimeBetweenListingPolls = new Bindable<double>();
-        public readonly Bindable<double> TimeBetweenSelectionPolls = new Bindable<double>();
+
         private readonly IBindable<bool> isConnected = new Bindable<bool>();
         private readonly Bindable<bool> allowPolling = new Bindable<bool>();
 
@@ -119,11 +119,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 TimeBetweenPolls = { BindTarget = TimeBetweenListingPolls },
                 AllowPolling = { BindTarget = allowPolling }
             },
-            new MultiplayerSelectionPollingComponent
-            {
-                TimeBetweenPolls = { BindTarget = TimeBetweenSelectionPolls },
-                AllowPolling = { BindTarget = allowPolling }
-            }
         };
 
         private class MultiplayerListingPollingComponent : ListingPollingComponent
@@ -146,26 +141,5 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
             protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
         }
-
-        private class MultiplayerSelectionPollingComponent : SelectionPollingComponent
-        {
-            public readonly IBindable<bool> AllowPolling = new Bindable<bool>();
-
-            protected override void LoadComplete()
-            {
-                base.LoadComplete();
-
-                AllowPolling.BindValueChanged(allowPolling =>
-                {
-                    if (!allowPolling.NewValue)
-                        return;
-
-                    if (IsLoaded)
-                        PollImmediately();
-                });
-            }
-
-            protected override Task Poll() => !AllowPolling.Value ? Task.CompletedTask : base.Poll();
-        }
     }
 }

osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs

@@ -8,6 +8,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
+using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps.Drawables;
 using osu.Game.Graphics.Containers;
@@ -165,7 +166,10 @@ namespace osu.Game.Screens.OnlinePlay
         private void onlineStateChanged(ValueChangedEvent<APIState> state) => Schedule(() =>
         {
             if (state.NewValue != APIState.Online)
+            {
+                Logger.Log("API connection was lost, can't continue with online play", LoggingTarget.Network, LogLevel.Important);
                 Schedule(forcefullyExit);
+            }
         });
 
         protected override void LoadComplete()