From 1fd2782dd4bb0a138e3aa842495ca175b617c660 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Sep 2018 19:15:02 +0900
Subject: [PATCH] Fix loading spinner not disappearing on empty channels

---
 osu.Game/Online/Chat/Channel.cs  | 10 ++++++++++
 osu.Game/Overlays/ChatOverlay.cs | 11 ++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/osu.Game/Online/Chat/Channel.cs b/osu.Game/Online/Chat/Channel.cs
index e68a84cd86..01560dd1fd 100644
--- a/osu.Game/Online/Chat/Channel.cs
+++ b/osu.Game/Online/Chat/Channel.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Online.Chat
         [JsonProperty(@"channel_id")]
         public int Id;
 
+        [JsonProperty(@"last_message_id")]
+        public long? LastMessageId;
+
         public readonly SortedList<Message> Messages = new SortedList<Message>(Comparer<Message>.Default);
 
         private readonly List<LocalEchoMessage> pendingMessages = new List<LocalEchoMessage>();
@@ -51,11 +54,18 @@ namespace osu.Game.Online.Chat
             NewMessagesArrived?.Invoke(new[] { message });
         }
 
+        public bool MessagesLoaded { get; private set; }
+
         public void AddNewMessages(params Message[] messages)
         {
             messages = messages.Except(Messages).ToArray();
 
             Messages.AddRange(messages);
+            MessagesLoaded = true;
+
+            var maxMessageId = messages.Max(m => m.Id);
+            if (maxMessageId > LastMessageId)
+                LastMessageId = maxMessageId;
 
             purgeOldMessages();
 
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index e22798faa8..774570a747 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -362,7 +362,7 @@ namespace osu.Game.Overlays
                     loadedChannels.Add(loaded);
                     LoadComponentAsync(loaded, l =>
                     {
-                        if (currentChannel.Messages.Any())
+                        if (currentChannel.MessagesLoaded)
                             loading.Hide();
 
                         currentChannelContainer.Clear(false);
@@ -398,7 +398,7 @@ namespace osu.Game.Overlays
                 if (channel.Type == ChannelType.Public && !channel.Joined)
                 {
                     var req = new JoinChannelRequest(channel, api.LocalUser);
-                    req.Success += addChannel;
+                    req.Success += () => addChannel(channel);
                     req.Failure += ex => removeChannel(channel);
                     api.Queue(req);
                     return;
@@ -431,16 +431,13 @@ namespace osu.Game.Overlays
         private void fetchInitialMessages(Channel channel)
         {
             var req = new GetMessagesRequest(channel);
-
             req.Success += messages =>
             {
-                loading.Hide();
                 channel.AddNewMessages(messages.ToArray());
-                Debug.Write("success!");
+                if (channel == currentChannel)
+                    loading.Hide();
             };
 
-            req.Failure += exception => Debug.Write("failure!");
-
             api.Queue(req);
         }