From 5e44329e0b0e7f5221c90e69baed3f73664084cc Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@craftplacer.moe>
Date: Sat, 5 Jun 2021 14:42:16 +0200
Subject: [PATCH] Add DummyAPIAccess request handler

Make CreateChannelRequest.channel public
---
 .../Visual/Online/TestSceneMessageNotifier.cs | 34 ++++++++++++++++---
 .../API/Requests/CreateChannelRequest.cs      |  6 ++--
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneMessageNotifier.cs b/osu.Game.Tests/Visual/Online/TestSceneMessageNotifier.cs
index a1c68d34d1..fada645632 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneMessageNotifier.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneMessageNotifier.cs
@@ -1,6 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
@@ -9,6 +10,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Testing;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
+using osu.Game.Online.API.Requests.Responses;
 using osu.Game.Online.Chat;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Notifications;
@@ -29,12 +32,9 @@ namespace osu.Game.Tests.Visual.Online
         [SetUp]
         public void Setup()
         {
-            // We blindly mark every request as success so that ChannelManager doesn't remove our channel again.
             if (API is DummyAPIAccess daa)
             {
-                daa.HandleRequest = (request) => {
-                    return true;
-                };
+                daa.HandleRequest = dummyAPIHandleRequest;
             }
 
             friend = new User { Id = 0, Username = "Friend" };
@@ -52,6 +52,32 @@ namespace osu.Game.Tests.Visual.Online
             });
         }
 
+        private bool dummyAPIHandleRequest(APIRequest request)
+        {
+            switch (request)
+            {
+                case GetMessagesRequest messagesRequest:
+                    messagesRequest.TriggerSuccess(new List<Message>(0));
+                    return true;
+
+                case CreateChannelRequest createChannelRequest:
+                    var apiChatChannel = new APIChatChannel
+                    {
+                        RecentMessages = new List<Message>(0),
+                        ChannelID = (int)createChannelRequest.Channel.Id
+                    };
+                    createChannelRequest.TriggerSuccess(apiChatChannel);
+                    return true;
+
+                case ListChannelsRequest listChannelsRequest:
+                    listChannelsRequest.TriggerSuccess(new List<Channel>(1) { publicChannel });
+                    return true;
+
+                default:
+                    return false;
+            }
+        }
+
         [Test]
         public void TestPublicChannelMention()
         {
diff --git a/osu.Game/Online/API/Requests/CreateChannelRequest.cs b/osu.Game/Online/API/Requests/CreateChannelRequest.cs
index 42cb201969..041ad26267 100644
--- a/osu.Game/Online/API/Requests/CreateChannelRequest.cs
+++ b/osu.Game/Online/API/Requests/CreateChannelRequest.cs
@@ -11,11 +11,11 @@ namespace osu.Game.Online.API.Requests
 {
     public class CreateChannelRequest : APIRequest<APIChatChannel>
     {
-        private readonly Channel channel;
+        public readonly Channel Channel;
 
         public CreateChannelRequest(Channel channel)
         {
-            this.channel = channel;
+            Channel = channel;
         }
 
         protected override WebRequest CreateWebRequest()
@@ -24,7 +24,7 @@ namespace osu.Game.Online.API.Requests
             req.Method = HttpMethod.Post;
 
             req.AddParameter("type", $"{ChannelType.PM}");
-            req.AddParameter("target_id", $"{channel.Users.First().Id}");
+            req.AddParameter("target_id", $"{Channel.Users.First().Id}");
 
             return req;
         }