Extract the message hadling logic into IncomingMessagesHandler

osu.Game/Online/Chat/ChannelManager.cs

@@ -47,13 +47,17 @@ namespace osu.Game.Online.Chat
         /// </summary>
         public ObservableCollection<Channel> AvailableChannels { get; } = new ObservableCollection<Channel>();
 
+        private readonly IncomingMessagesHandler channelMessagesHandler;
+        private readonly IncomingMessagesHandler privateMessagesHandler;
+
         private IAPIProvider api;
         private ScheduledDelegate fetchMessagesScheduleder;
-        private GetMessagesRequest fetchMessageReq;
-        private GetPrivateMessagesRequest fetchUserMsgReq;
-        private long? lastChannelMsgId;
-        private long? lastUserMsgId;
 
+        /// <summary>
+        /// Opens a channel or switches to the channel if already opened.
+        /// </summary>
+        /// <exception cref="ChannelNotFoundException">If the name of the specifed channel was not found this exception will be thrown.</exception>
+        /// <param name="name"></param>
         public void OpenChannel(string name)
         {
             if (name == null)
@@ -63,7 +67,11 @@ namespace osu.Game.Online.Chat
                                    ?? throw new ChannelNotFoundException(name);
         }
 
-        public void OpenUserChannel(User user)
+        /// <summary>
+        /// Opens a new private channel.
+        /// </summary>
+        /// <param name="user"></param>
+        public void OpenPrivateChannel(User user)
         {
             if (user == null)
                 throw new ArgumentNullException(nameof(user));
@@ -75,6 +83,14 @@ namespace osu.Game.Online.Chat
         public ChannelManager()
         {
             CurrentChannel.ValueChanged += currentChannelChanged;
+
+            channelMessagesHandler = new IncomingMessagesHandler();
+            channelMessagesHandler.CreateMessagesRequest = () => new GetMessagesRequest(JoinedChannels.Where(c => c.Target == TargetType.Channel), channelMessagesHandler.LastMessageId);
+            channelMessagesHandler.OnNewMessages = handleChannelMessages;
+
+            privateMessagesHandler = new IncomingMessagesHandler();
+            privateMessagesHandler.CreateMessagesRequest = () => new GetPrivateMessagesRequest(privateMessagesHandler.LastMessageId);
+            privateMessagesHandler.OnNewMessages = handleUserMessages;
         }
 
         private void currentChannelChanged(Channel channel)
@@ -156,32 +172,11 @@ namespace osu.Game.Online.Chat
 
         private void fetchNewMessages()
         {
-            if (fetchMessageReq == null)
+            if (channelMessagesHandler.CanRequestNewMessages)
-                fetchMessages(
+                channelMessagesHandler.RequestNewMessages(api);
-                    () => fetchMessageReq = new GetMessagesRequest(JoinedChannels.Where(c => c.Target == TargetType.Channel), lastChannelMsgId),
-                    messages =>
-                    {
-                        if (messages == null)
-                            return;
-                        handleChannelMessages(messages);
-                        lastChannelMsgId = messages.LastOrDefault()?.Id ?? lastChannelMsgId;
-                        fetchMessageReq = null;
-                    }
-                );
 
-
+            if (privateMessagesHandler.CanRequestNewMessages)
-            if (fetchUserMsgReq == null)
+                privateMessagesHandler.RequestNewMessages(api);
-                fetchMessages(
-                    () => fetchUserMsgReq = new GetPrivateMessagesRequest(lastUserMsgId),
-                    messages =>
-                    {
-                        if (messages == null)
-                            return;
-                        handleUserMessages(messages);
-                        lastUserMsgId = messages.Max(m => m.Id) ?? lastUserMsgId;
-                        fetchUserMsgReq = null;
-                    }
-                );
         }
 
         private void fetchMessages(Func<APIMessagesRequest> messagesRequest, Action<List<Message>> handler)
@@ -272,7 +267,7 @@ namespace osu.Game.Online.Chat
                 channels.Where(channel => AvailableChannels.All(c => c.Id != channel.Id))
                         .ForEach(channel => AvailableChannels.Add(channel));
 
-                channels.Where(channel => defaultChannels.Contains(channel.Name))
+                channels.Where(channel => defaultChannels.Any(c => c.Equals(channel.Name, StringComparison.OrdinalIgnoreCase)))
                         .Where(channel => JoinedChannels.All(c => c.Id != channel.Id))
                         .ForEach(channel =>
                         {
@@ -286,7 +281,12 @@ namespace osu.Game.Online.Chat
 
                 fetchNewMessages();
             };
-            req.Failure += error => Logger.Error(error, "Fetching channel list failed");
+            req.Failure += error =>
+            {
+                Logger.Error(error, "Fetching channel list failed");
+
+                initializeDefaultChannels();
+            };
 
             api.Queue(req);
         }
@@ -298,12 +298,15 @@ namespace osu.Game.Online.Chat
                 case APIState.Online:
                     if (JoinedChannels.Count == 0)
                         initializeDefaultChannels();
+
                     fetchMessagesScheduleder = Scheduler.AddDelayed(fetchNewMessages, 1000, true);
                     break;
                 default:
-                    fetchMessageReq?.Cancel();
+                    channelMessagesHandler.CancelOngoingRequests();
-                    fetchMessageReq = null;
+                    privateMessagesHandler.CancelOngoingRequests();
+
                     fetchMessagesScheduleder?.Cancel();
+                    fetchMessagesScheduleder = null;
                     break;
             }
         }

osu.Game/Online/Chat/IncomingMessagesHandler.cs

@@ -0,0 +1,66 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Logging;
+using osu.Game.Online.API;
+
+namespace osu.Game.Online.Chat
+{
+    public class IncomingMessagesHandler
+    {
+        public long? LastMessageId { get; private set; }
+
+        private APIMessagesRequest getMessagesRequest;
+
+        public Func<APIMessagesRequest> CreateMessagesRequest { set; private get; }
+
+        public Action<List<Message>> OnNewMessages { set; private get; }
+
+        public bool CanRequestNewMessages => getMessagesRequest == null;
+
+        public void RequestNewMessages(IAPIProvider api)
+        {
+            if (!CanRequestNewMessages)
+                throw new InvalidOperationException("Requesting new messages is not possible yet, because the old request is still ongoing.");
+
+            if (OnNewMessages == null)
+                throw new InvalidOperationException($"You need to set an handler for the new incoming messages ({nameof(OnNewMessages)}) first before using {nameof(RequestNewMessages)}.");
+
+            getMessagesRequest = CreateMessagesRequest.Invoke();
+
+            getMessagesRequest.Success += handleNewMessages;
+            getMessagesRequest.Failure += exception =>
+            {
+                Logger.Error(exception, "Fetching messages failed.");
+
+                //allowing new messages to be requested even after the fail.
+                getMessagesRequest = null;
+            };
+
+            api.Queue(getMessagesRequest);
+        }
+
+        private void handleNewMessages(List<Message> messages)
+        {
+
+            //allowing new messages to be requested.
+            getMessagesRequest = null;
+
+            //in case of no new messages we simply do nothing.
+            if (messages == null || messages.Count == 0)
+                return;
+
+            OnNewMessages.Invoke(messages);
+
+            LastMessageId = messages.Max(m => m.Id) ?? LastMessageId;
+        }
+
+        public void CancelOngoingRequests()
+        {
+            getMessagesRequest?.Cancel();
+        }
+    }
+}