From 3c8c7a0459e4ce0181418222313027022b896d68 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 14 Sep 2018 12:06:04 +0900
Subject: [PATCH] Move ChannelManager to OsuGame

There's no reason for it to exist at OsuGameBase
---
 osu.Game.Tests/Visual/TestCaseChatDisplay.cs | 16 ++++++++++----
 osu.Game/Online/Chat/ChannelManager.cs       | 22 ++++++++++----------
 osu.Game/OsuGame.cs                          |  6 ++++++
 osu.Game/OsuGameBase.cs                      |  5 -----
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseChatDisplay.cs b/osu.Game.Tests/Visual/TestCaseChatDisplay.cs
index dc47055a87..e3bd4026b3 100644
--- a/osu.Game.Tests/Visual/TestCaseChatDisplay.cs
+++ b/osu.Game.Tests/Visual/TestCaseChatDisplay.cs
@@ -4,7 +4,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Online.Chat;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Chat;
 using osu.Game.Overlays.Chat.Tabs;
@@ -26,12 +29,17 @@ namespace osu.Game.Tests.Visual
             typeof(TabCloseButton)
         };
 
-        public TestCaseChatDisplay()
+        [Cached]
+        private readonly ChannelManager channelManager = new ChannelManager();
+
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            Add(new ChatOverlay
+            Children = new Drawable[]
             {
-                State = Visibility.Visible
-            });
+                channelManager,
+                new ChatOverlay { State = Visibility.Visible }
+            };
         }
     }
 }
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 7d3d21554e..21e1739c59 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -52,6 +52,17 @@ namespace osu.Game.Online.Chat
         private IAPIProvider api;
         private ScheduledDelegate fetchMessagesScheduleder;
 
+        public ChannelManager()
+        {
+            CurrentChannel.ValueChanged += currentChannelChanged;
+
+            channelMessagesHandler = new IncomingMessagesHandler(
+                lastId => new GetMessagesRequest(JoinedChannels.Where(c => c.Target == TargetType.Channel), lastId), handleChannelMessages);
+
+            privateMessagesHandler = new IncomingMessagesHandler(
+                lastId => new GetPrivateMessagesRequest(lastId),handleUserMessages);
+        }
+
         /// <summary>
         /// Opens a channel or switches to the channel if already opened.
         /// </summary>
@@ -79,17 +90,6 @@ namespace osu.Game.Online.Chat
                                    ?? new PrivateChannel { User = user };
         }
 
-        public ChannelManager()
-        {
-            CurrentChannel.ValueChanged += currentChannelChanged;
-
-            channelMessagesHandler = new IncomingMessagesHandler(
-                lastId => new GetMessagesRequest(JoinedChannels.Where(c => c.Target == TargetType.Channel), lastId), handleChannelMessages);
-
-            privateMessagesHandler = new IncomingMessagesHandler(
-                lastId => new GetPrivateMessagesRequest(lastId),handleUserMessages);
-        }
-
         private void currentChannelChanged(Channel channel)
         {
             if (!JoinedChannels.Contains(channel))
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index e823041c42..f08ee42c40 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -31,6 +31,7 @@ using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
 using osu.Game.Input.Bindings;
+using osu.Game.Online.Chat;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Skinning;
 using OpenTK.Graphics;
@@ -339,6 +340,11 @@ namespace osu.Game
             //overlay elements
             loadComponentSingleFile(direct = new DirectOverlay { Depth = -1 }, mainContent.Add);
             loadComponentSingleFile(social = new SocialOverlay { Depth = -1 }, mainContent.Add);
+            loadComponentSingleFile(new ChannelManager(), channelManager =>
+            {
+                dependencies.Cache(channelManager);
+                AddInternal(channelManager);
+            });
             loadComponentSingleFile(chat = new ChatOverlay { Depth = -1 }, mainContent.Add);
             loadComponentSingleFile(settings = new MainSettings
             {
diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 84462bd8c2..9a5dac35b9 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -27,7 +27,6 @@ using osu.Game.Database;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
-using osu.Game.Online.Chat;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Skinning;
@@ -152,10 +151,6 @@ namespace osu.Game
             dependencies.Cache(api);
             dependencies.CacheAs<IAPIProvider>(api);
 
-            var channelManager = new ChannelManager();
-            dependencies.Cache(channelManager);
-            AddInternal(channelManager);
-
             dependencies.Cache(RulesetStore = new RulesetStore(contextFactory));
             dependencies.Cache(FileStore = new FileStore(contextFactory, Host.Storage));
             dependencies.Cache(BeatmapManager = new BeatmapManager(Host.Storage, contextFactory, RulesetStore, api, Audio, Host));