From a171ed350006fa6f918d527dbefccddf920c13c7 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Oct 2018 16:12:20 +0900
Subject: [PATCH] Fix joined channels not appearing as joined in the channel
 list

---
 osu.Game/Overlays/ChatOverlay.cs | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index eeadac8e8c..ff2ff9af14 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -291,7 +291,7 @@ namespace osu.Game.Overlays
             messageRequest?.Cancel();
 
             ListChannelsRequest req = new ListChannelsRequest();
-            req.Success += delegate (List<Channel> channels)
+            req.Success += delegate(List<Channel> channels)
             {
                 AvailableChannels = channels;
 
@@ -323,10 +323,7 @@ namespace osu.Game.Overlays
 
         protected Channel CurrentChannel
         {
-            get
-            {
-                return currentChannel;
-            }
+            get { return currentChannel; }
 
             set
             {
@@ -445,13 +442,7 @@ namespace osu.Game.Overlays
                 if (updates?.Presence != null)
                 {
                     foreach (var channel in updates.Presence)
-                    {
-                        if (careChannels.Find(c => c.Id == channel.Id) == null)
-                        {
-                            channel.Joined.Value = true;
-                            addChannel(channel);
-                        }
-                    }
+                        addChannel(AvailableChannels.Find(c => c.Id == channel.Id));
 
                     foreach (var group in updates.Messages.GroupBy(m => m.ChannelId))
                         careChannels.Find(c => c.Id == group.Key)?.AddNewMessages(group.ToArray());
@@ -462,10 +453,7 @@ namespace osu.Game.Overlays
                 fetchReq = null;
             };
 
-            fetchReq.Failure += delegate
-            {
-                fetchReq = null;
-            };
+            fetchReq.Failure += delegate { fetchReq = null; };
 
             api.Queue(fetchReq);
         }