Merge branch 'master' into rebind-song-select

osu.Game.Tests/Visual/Online/TestSceneChatOverlay.cs

@@ -246,7 +246,12 @@ namespace osu.Game.Tests.Visual.Online
             {
                 ((BindableList<Channel>)ChannelManager.AvailableChannels).AddRange(channels);
 
-                Child = ChatOverlay = new TestChatOverlay { RelativeSizeAxes = Axes.Both, };
+                InternalChildren = new Drawable[]
+                {
+                    ChannelManager,
+                    ChatOverlay = new TestChatOverlay { RelativeSizeAxes = Axes.Both, },
+                };
+
                 ChatOverlay.Show();
             }
         }

osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs

@@ -36,12 +36,14 @@ namespace osu.Game.Tests.Visual.Ranking
                 Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
         }
 
-        private TestSoloResults createResultsScreen() => new TestSoloResults(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+        private TestResultsScreen createResultsScreen() => new TestResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo));
+
+        private UnrankedSoloResultsScreen createUnrankedSoloResultsScreen() => new UnrankedSoloResultsScreen(new TestScoreInfo(new OsuRuleset().RulesetInfo));
 
         [Test]
         public void ResultsWithoutPlayer()
         {
-            TestSoloResults screen = null;
+            TestResultsScreen screen = null;
             OsuScreenStack stack;
 
             AddStep("load results", () =>
@@ -60,13 +62,23 @@ namespace osu.Game.Tests.Visual.Ranking
         [Test]
         public void ResultsWithPlayer()
         {
-            TestSoloResults screen = null;
+            TestResultsScreen screen = null;
 
             AddStep("load results", () => Child = new TestResultsContainer(screen = createResultsScreen()));
             AddUntilStep("wait for loaded", () => screen.IsLoaded);
             AddAssert("retry overlay present", () => screen.RetryOverlay != null);
         }
 
+        [Test]
+        public void ResultsForUnranked()
+        {
+            UnrankedSoloResultsScreen screen = null;
+
+            AddStep("load results", () => Child = new TestResultsContainer(screen = createUnrankedSoloResultsScreen()));
+            AddUntilStep("wait for loaded", () => screen.IsLoaded);
+            AddAssert("retry overlay present", () => screen.RetryOverlay != null);
+        }
+
         private class TestResultsContainer : Container
         {
             [Cached(typeof(Player))]
@@ -86,11 +98,11 @@ namespace osu.Game.Tests.Visual.Ranking
             }
         }
 
-        private class TestSoloResults : ResultsScreen
+        private class TestResultsScreen : ResultsScreen
         {
             public HotkeyRetryOverlay RetryOverlay;
 
-            public TestSoloResults(ScoreInfo score)
+            public TestResultsScreen(ScoreInfo score)
                 : base(score)
             {
             }
@@ -102,5 +114,24 @@ namespace osu.Game.Tests.Visual.Ranking
                 RetryOverlay = InternalChildren.OfType<HotkeyRetryOverlay>().SingleOrDefault();
             }
         }
+
+        private class UnrankedSoloResultsScreen : SoloResultsScreen
+        {
+            public HotkeyRetryOverlay RetryOverlay;
+
+            public UnrankedSoloResultsScreen(ScoreInfo score)
+                : base(score)
+            {
+                Score.Beatmap.OnlineBeatmapID = 0;
+                Score.Beatmap.Status = BeatmapSetOnlineStatus.Pending;
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+
+                RetryOverlay = InternalChildren.OfType<HotkeyRetryOverlay>().SingleOrDefault();
+            }
+        }
     }
 }

osu.Game/Online/Chat/ChannelManager.cs

@@ -93,12 +93,6 @@ namespace osu.Game.Online.Chat
         {
             if (!(e.NewValue is ChannelSelectorTabItem.ChannelSelectorTabChannel))
                 JoinChannel(e.NewValue);
-
-            if (e.NewValue?.MessagesLoaded == false)
-            {
-                // let's fetch a small number of messages to bring us up-to-date with the backlog.
-                fetchInitalMessages(e.NewValue);
-            }
         }
 
         /// <summary>
@@ -240,7 +234,6 @@ namespace osu.Game.Online.Chat
                     }
 
                     JoinChannel(channel);
-                    CurrentChannel.Value = channel;
                     break;
 
                 case "help":
@@ -275,7 +268,7 @@ namespace osu.Game.Online.Chat
 
                     // join any channels classified as "defaults"
                     if (joinDefaults && defaultChannels.Any(c => c.Equals(channel.Name, StringComparison.OrdinalIgnoreCase)))
-                        JoinChannel(ch);
+                        joinChannel(ch);
                 }
             };
             req.Failure += error =>
@@ -296,7 +289,7 @@ namespace osu.Game.Online.Chat
         /// <param name="channel">The channel </param>
         private void fetchInitalMessages(Channel channel)
         {
-            if (channel.Id <= 0) return;
+            if (channel.Id <= 0 || channel.MessagesLoaded) return;
 
             var fetchInitialMsgReq = new GetMessagesRequest(channel);
             fetchInitialMsgReq.Success += messages =>
@@ -351,9 +344,10 @@ namespace osu.Game.Online.Chat
         /// Joins a channel if it has not already been joined.
         /// </summary>
         /// <param name="channel">The channel to join.</param>
-        /// <param name="alreadyJoined">Whether the channel has already been joined server-side. Will skip a join request.</param>
         /// <returns>The joined channel. Note that this may not match the parameter channel as it is a backed object.</returns>
-        public Channel JoinChannel(Channel channel, bool alreadyJoined = false)
+        public Channel JoinChannel(Channel channel) => joinChannel(channel, true);
+
+        private Channel joinChannel(Channel channel, bool fetchInitialMessages = false)
         {
             if (channel == null) return null;
 
@@ -362,21 +356,36 @@ namespace osu.Game.Online.Chat
             // ensure we are joined to the channel
             if (!channel.Joined.Value)
             {
-                if (alreadyJoined)
+                switch (channel.Type)
-                    channel.Joined.Value = true;
-                else
                 {
-                    switch (channel.Type)
+                    case ChannelType.Multiplayer:
-                    {
+                        // join is implicit. happens when you join a multiplayer game.
-                        case ChannelType.Public:
+                        // this will probably change in the future.
-                            var req = new JoinChannelRequest(channel, api.LocalUser.Value);
+                        channel.Joined.Value = true;
-                            req.Success += () => JoinChannel(channel, true);
+                        joinChannel(channel, fetchInitialMessages);
-                            req.Failure += ex => LeaveChannel(channel);
+                        return channel;
-                            api.Queue(req);
+
-                            return channel;
+                    case ChannelType.Private:
-                    }
+                        // can't do this yet.
+                        break;
+
+                    default:
+                        var req = new JoinChannelRequest(channel, api.LocalUser.Value);
+                        req.Success += () =>
+                        {
+                            channel.Joined.Value = true;
+                            joinChannel(channel, fetchInitialMessages);
+                        };
+                        req.Failure += ex => LeaveChannel(channel);
+                        api.Queue(req);
+                        return channel;
                 }
             }
+            else
+            {
+                if (fetchInitialMessages)
+                    fetchInitalMessages(channel);
+            }
 
             if (CurrentChannel.Value == null)
                 CurrentChannel.Value = channel;
@@ -420,7 +429,8 @@ namespace osu.Game.Online.Chat
                     foreach (var channel in updates.Presence)
                     {
                         // we received this from the server so should mark the channel already joined.
-                        JoinChannel(channel, true);
+                        channel.Joined.Value = true;
+                        joinChannel(channel);
                     }
 
                     //todo: handle left channels

osu.Game/Rulesets/Objects/SliderEventGenerator.cs

@@ -11,6 +11,7 @@ namespace osu.Game.Rulesets.Objects
     public static class SliderEventGenerator
     {
         [Obsolete("Use the overload with cancellation support instead.")] // can be removed 20201115
+        // ReSharper disable once RedundantOverload.Global
         public static IEnumerable<SliderEventDescriptor> Generate(double startTime, double spanDuration, double velocity, double tickDistance, double totalDistance, int spanCount,
                                                                   double? legacyLastTickOffset)
         {

osu.Game/Screens/Ranking/SoloResultsScreen.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Rulesets;
@@ -24,6 +25,9 @@ namespace osu.Game.Screens.Ranking
 
         protected override APIRequest FetchScores(Action<IEnumerable<ScoreInfo>> scoresCallback)
         {
+            if (Score.Beatmap.OnlineBeatmapID == null || Score.Beatmap.Status <= BeatmapSetOnlineStatus.Pending)
+                return null;
+
             var req = new GetScoresRequest(Score.Beatmap, Score.Ruleset);
             req.Success += r => scoresCallback?.Invoke(r.Scores.Where(s => s.OnlineScoreID != Score.OnlineScoreID).Select(s => s.CreateScoreInfo(rulesets)));
             return req;