From 8c0bcb8e3c01e92b554e2251e85e4f3e76ff18d1 Mon Sep 17 00:00:00 2001
From: miterosan <miterosan@gmail.com>
Date: Sun, 29 Jul 2018 21:40:43 +0200
Subject: [PATCH] Fix drawable crash and lload the inital messages of newly
 joined channels

---
 osu.Game/Online/Chat/ChannelManager.cs | 37 +++++++++++---------------
 osu.Game/Overlays/ChatOverlay.cs       |  5 +++-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index f34321f597..7d3d21554e 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -180,21 +180,6 @@ namespace osu.Game.Online.Chat
                 privateMessagesHandler.RequestNewMessages(api);
         }
 
-        private void fetchMessages(Func<APIMessagesRequest> messagesRequest, Action<List<Message>> handler)
-        {
-            if (messagesRequest == null)
-                throw new ArgumentNullException(nameof(messagesRequest));
-            if (handler == null)
-                throw new ArgumentNullException(nameof(handler));
-
-            var messagesReq = messagesRequest.Invoke();
-
-            messagesReq.Success += handler.Invoke;
-            messagesReq.Failure += exception => Logger.Error(exception, "Fetching messages failed.");
-
-            api.Queue(messagesReq);
-        }
-
         private void handleUserMessages(IEnumerable<Message> messages)
         {
             var joinedPrivateChannels = JoinedChannels.Where(c => c.Target == TargetType.User).ToList();
@@ -279,12 +264,7 @@ namespace osu.Game.Online.Chat
                     {
                         JoinedChannels.Add(channel);
 
-                        // TODO: remove this when the API supports returning initial fetch messages for more than one channel.
-                        // right now it caps out at 50 messages and therefore only returns one channel's worth of content.
-                        var fetchInitialMsgReq = new GetMessagesRequest(new[] { channel }, null);
-                        fetchInitialMsgReq.Success += handleChannelMessages;
-                        fetchInitialMsgReq.Failure += exception => Logger.Error(exception, "Failed to fetch inital messages.");
-                        api.Queue(fetchInitialMsgReq);
+                        FetchInitalMessages(channel);
                     }
                 }
 
@@ -300,6 +280,21 @@ namespace osu.Game.Online.Chat
             api.Queue(req);
         }
 
+        /// <summary>
+        /// Fetches inital messages of a channel
+        ///
+        /// TODO: remove this when the API supports returning initial fetch messages for more than one channel by specifying the last message id per channel instead of one last message id globally.
+        /// right now it caps out at 50 messages and therefore only returns one channel's worth of content.
+        /// </summary>
+        /// <param name="channel">The channel </param>
+        public void FetchInitalMessages(Channel channel)
+        {
+            var fetchInitialMsgReq = new GetMessagesRequest(new[] { channel }, null);
+            fetchInitialMsgReq.Success += handleChannelMessages;
+            fetchInitialMsgReq.Failure += exception => Logger.Error(exception, $"Failed to fetch inital messages for the channel {channel.Name}");
+            api.Queue(fetchInitialMsgReq);
+        }
+
         public void APIStateChanged(APIAccess api, APIState state)
         {
             switch (state)
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 99f392a183..d3277fb0a9 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -184,7 +184,10 @@ namespace osu.Game.Overlays
             channelSelection.OnRequestJoin = channel =>
             {
                 if (!channelManager.JoinedChannels.Contains(channel))
+                {
                     channelManager.JoinedChannels.Add(channel);
+                    channelManager.FetchInitalMessages(channel);
+                }
             };
             channelSelection.OnRequestLeave = channel => channelManager.JoinedChannels.Remove(channel);
         }
@@ -248,7 +251,7 @@ namespace osu.Game.Overlays
             else
             {
                 currentChannelContainer.Clear(false);
-                currentChannelContainer.Add(loaded);
+                Scheduler.Add(() => currentChannelContainer.Add(loaded));
             }
         }