From 1b51da70af764574b89af8d8c0c1fa1ee74ea6d1 Mon Sep 17 00:00:00 2001
From: miterosan <miterosan@gmail.com>
Date: Sat, 14 Apr 2018 13:23:16 +0200
Subject: [PATCH] Create an abstraction for APIMessagesRequest

---
 osu.Game/Online/API/APIMessagesRequest.cs     | 28 +++++++++
 .../Online/API/Requests/GetMessagesRequest.cs |  7 +--
 .../API/Requests/GetPrivateMessagesRequest.cs | 17 +----
 osu.Game/Online/Chat/ChannelManager.cs        | 62 ++++++++++---------
 4 files changed, 65 insertions(+), 49 deletions(-)
 create mode 100644 osu.Game/Online/API/APIMessagesRequest.cs

diff --git a/osu.Game/Online/API/APIMessagesRequest.cs b/osu.Game/Online/API/APIMessagesRequest.cs
new file mode 100644
index 0000000000..e1be6cdb19
--- /dev/null
+++ b/osu.Game/Online/API/APIMessagesRequest.cs
@@ -0,0 +1,28 @@
+// 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.Collections.Generic;
+using osu.Framework.IO.Network;
+using osu.Game.Online.Chat;
+
+namespace osu.Game.Online.API
+{
+    public abstract class APIMessagesRequest : APIRequest<List<Message>>
+    {
+        private long? sinceId;
+
+        protected APIMessagesRequest(long? sinceId)
+        {
+            this.sinceId = sinceId;
+        }
+
+        protected override WebRequest CreateWebRequest()
+        {
+            var req = base.CreateWebRequest();
+
+            if (sinceId.HasValue) req.AddParameter(@"since", sinceId.Value.ToString());
+
+            return req;
+        }
+    }
+}
diff --git a/osu.Game/Online/API/Requests/GetMessagesRequest.cs b/osu.Game/Online/API/Requests/GetMessagesRequest.cs
index d2c9169c51..cf6a0cb6fd 100644
--- a/osu.Game/Online/API/Requests/GetMessagesRequest.cs
+++ b/osu.Game/Online/API/Requests/GetMessagesRequest.cs
@@ -9,12 +9,11 @@ using osu.Game.Online.Chat;
 
 namespace osu.Game.Online.API.Requests
 {
-    public class GetMessagesRequest : APIRequest<List<Message>>
+    public class GetMessagesRequest : APIMessagesRequest
     {
         private readonly IEnumerable<Channel> channels;
-        private long? since;
 
-        public GetMessagesRequest(IEnumerable<Channel> channels, long? sinceId)
+        public GetMessagesRequest(IEnumerable<Channel> channels, long? sinceId) : base(sinceId)
         {
             if (channels == null)
                 throw new ArgumentNullException(nameof(channels));
@@ -22,7 +21,6 @@ namespace osu.Game.Online.API.Requests
                 throw new ArgumentException("All channels in the argument channels must have the targettype Channel");
 
             this.channels = channels;
-            since = sinceId;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -31,7 +29,6 @@ namespace osu.Game.Online.API.Requests
 
             var req = base.CreateWebRequest();
             req.AddParameter(@"channels", channelString);
-            if (since.HasValue) req.AddParameter(@"since", since.Value.ToString());
 
             return req;
         }
diff --git a/osu.Game/Online/API/Requests/GetPrivateMessagesRequest.cs b/osu.Game/Online/API/Requests/GetPrivateMessagesRequest.cs
index 9ff70f8580..b5d7bb06ee 100644
--- a/osu.Game/Online/API/Requests/GetPrivateMessagesRequest.cs
+++ b/osu.Game/Online/API/Requests/GetPrivateMessagesRequest.cs
@@ -1,28 +1,15 @@
 // 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.Collections.Generic;
-using osu.Framework.IO.Network;
-using osu.Game.Online.Chat;
-
 namespace osu.Game.Online.API.Requests
 {
-    public class GetPrivateMessagesRequest : APIRequest<List<Message>>
+    public class GetPrivateMessagesRequest : APIMessagesRequest
     {
         private long? since;
 
         public GetPrivateMessagesRequest(long? sinceId = null)
+            : base(sinceId)
         {
-            since = sinceId;
-        }
-
-        protected override WebRequest CreateWebRequest()
-        {
-            var request = base.CreateWebRequest();
-            if (since.HasValue)
-                request.AddParameter(@"since", since.Value.ToString());
-
-            return request;
         }
 
         protected override string Target => @"chat/messages/private";
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index e5fe3fb56e..3709e42880 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -152,25 +152,46 @@ namespace osu.Game.Online.Chat
         private void fetchNewMessages()
         {
             if (fetchMsgReq == null)
-                fetchNewChannelMessages();
+                fetchMessages(
+                    () => new GetMessagesRequest(JoinedChannels.Where(c => c.Target == TargetType.Channel), lastChannelMsgId),
+                    messages =>
+                    {
+                        if (messages == null)
+                            return;
+                        handleChannelMessages(messages);
+                        lastChannelMsgId = messages.LastOrDefault()?.Id ?? lastChannelMsgId;
+                        fetchMsgReq = null;
+                    }
+                );
+
 
             if (fetchPrivateMsgReq == null)
-                fetchNewUserMessages();
+                fetchMessages(
+                    () => new GetPrivateMessagesRequest(lastChannelMsgId),
+                    messages =>
+                    {
+                        if (messages == null)
+                            return;
+                        handleUserMessages(messages);
+                        lastUserMsgId = messages.LastOrDefault()?.Id ?? lastUserMsgId;
+                        fetchPrivateMsgReq = null;
+                    }
+                );
         }
 
-        private void fetchNewUserMessages()
+        private void fetchMessages(Func<APIMessagesRequest> messagesRequest, Action<List<Message>> handler)
         {
-            fetchPrivateMsgReq = new GetPrivateMessagesRequest(lastUserMsgId);
+            if (messagesRequest == null)
+                throw new ArgumentNullException(nameof(messagesRequest));
+            if (handler == null)
+                throw new ArgumentNullException(nameof(handler));
 
-            fetchPrivateMsgReq.Success += messages =>
-            {
-                handleUserMessages(messages);
-                lastUserMsgId = messages.LastOrDefault()?.Id ?? lastUserMsgId;
-                fetchPrivateMsgReq = null;
-            };
-            fetchPrivateMsgReq.Failure += exception => Logger.Error(exception, "Fetching user messages failed.");
+            var messagesReq = messagesRequest.Invoke();
 
-            api.Queue(fetchPrivateMsgReq);
+            messagesReq.Success += handler.Invoke;
+            messagesReq.Failure += exception => Logger.Error(exception, "Fetching messages failed.");
+
+            api.Queue(messagesReq);
         }
 
         private void handleUserMessages(IEnumerable<Message> messages)
@@ -218,23 +239,6 @@ namespace osu.Game.Online.Chat
             }
         }
 
-        private void fetchNewChannelMessages()
-        {
-            fetchMsgReq = new GetMessagesRequest(JoinedChannels.Where(c => c.Target == TargetType.Channel), lastChannelMsgId);
-
-            fetchMsgReq.Success += messages =>
-            {
-                if (messages == null)
-                    return;
-                handleChannelMessages(messages);
-                lastChannelMsgId = messages.LastOrDefault()?.Id ?? lastChannelMsgId;
-                fetchMsgReq = null;
-            };
-            fetchMsgReq.Failure += exception => Logger.Error(exception, "Fetching channel messages failed.");
-
-            api.Queue(fetchMsgReq);
-        }
-
         private void handleChannelMessages(IEnumerable<Message> messages)
         {
             var channels = JoinedChannels.ToList();