From f0ea445e4696082bf6a906f7762eeb7e5e1ee825 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 16 May 2017 15:56:53 +0900
Subject: [PATCH] Fix initial requests of channel mesages not being performed

fetchReq was being set even for initial lookups, which caused only one to run, and subsequent requests to be excessive to try and catch up.
---
 osu.Game/Overlays/ChatOverlay.cs | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 111d3e5eb4..5bbf20e196 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -245,7 +245,7 @@ namespace osu.Game.Overlays
                     addChannel(channels.Find(c => c.Name == @"#lobby"));
                 });
 
-                messageRequest = Scheduler.AddDelayed(() => fetchNewMessages(), 1000, true);
+                messageRequest = Scheduler.AddDelayed(fetchNewMessages, 1000, true);
             };
 
             api.Queue(req);
@@ -289,17 +289,34 @@ namespace osu.Game.Overlays
             channelTabs.AddItem(channel);
 
             // we need to get a good number of messages initially for each channel we care about.
-            fetchNewMessages(channel);
+            fetchInitialMessages(channel);
 
             if (CurrentChannel == null)
                 CurrentChannel = channel;
         }
 
-        private void fetchNewMessages(Channel specificChannel = null)
+        private void fetchInitialMessages(Channel channel)
+        {
+            var req = new GetMessagesRequest(new List<Channel> { channel }, null);
+
+            req.Success += delegate (List<Message> messages)
+            {
+                channel.AddNewMessages(messages.ToArray());
+                Debug.Write("success!");
+            };
+            req.Failure += delegate
+            {
+                Debug.Write("failure!");
+            };
+
+            api.Queue(req);
+        }
+
+        private void fetchNewMessages()
         {
             if (fetchReq != null) return;
 
-            fetchReq = new GetMessagesRequest(specificChannel != null ? new List<Channel> { specificChannel } : careChannels, lastMessageId);
+            fetchReq = new GetMessagesRequest(careChannels, lastMessageId);
             fetchReq.Success += delegate (List<Message> messages)
             {
                 var ids = messages.Where(m => m.TargetType == TargetType.Channel).Select(m => m.TargetId).Distinct();