From 67e99b53448c9311e9aa65543aa94aaf5db031eb Mon Sep 17 00:00:00 2001
From: Dan Balasescu <smoogipoo@smgi.me>
Date: Mon, 7 Nov 2022 14:34:53 +0900
Subject: [PATCH] Lookup channels before calling HandleJoinedChannel()

---
 osu.Game/Online/Chat/ChannelManager.cs        | 18 +++++-------
 .../Notifications/NotificationsClient.cs      |  9 +++---
 .../WebSocket/WebSocketNotificationsClient.cs | 29 ++++++++++++++++---
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index ee6e22fbc1..076f79a700 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -86,17 +86,7 @@ namespace osu.Game.Online.Chat
         [BackgroundDependencyLoader]
         private void load()
         {
-            connector.ChannelJoined += ch => Schedule(() =>
-            {
-                if (ch.Joined.Value)
-                    JoinChannel(ch);
-                else
-                {
-                    var req = new GetChannelRequest(ch.Id);
-                    req.Success += response => JoinChannel(response.Channel);
-                    api.Queue(req);
-                }
-            });
+            connector.ChannelJoined += ch => Schedule(() => joinChannel(ch));
 
             connector.ChannelParted += ch => Schedule(() => LeaveChannel(getChannel(ch)));
 
@@ -446,6 +436,12 @@ namespace osu.Game.Online.Chat
                 if (foundSelf != null)
                     found.Users.Remove(foundSelf);
             }
+            else
+            {
+                found.Id = lookup.Id;
+                found.Name = lookup.Name;
+                found.LastMessageId = Math.Max(found.LastMessageId ?? 0, lookup.LastMessageId ?? 0);
+            }
 
             if (joined == null && addToJoined) joinedChannels.Add(found);
             if (available == null && addToAvailable) availableChannels.Add(found);
diff --git a/osu.Game/Online/Notifications/NotificationsClient.cs b/osu.Game/Online/Notifications/NotificationsClient.cs
index c706124351..e5f477bc1e 100644
--- a/osu.Game/Online/Notifications/NotificationsClient.cs
+++ b/osu.Game/Online/Notifications/NotificationsClient.cs
@@ -46,10 +46,7 @@ namespace osu.Game.Online.Notifications
                 if (updates?.Presence != null)
                 {
                     foreach (var channel in updates.Presence)
-                    {
-                        channel.Joined.Value = true;
                         HandleJoinedChannel(channel);
-                    }
 
                     //todo: handle left channels
 
@@ -62,7 +59,11 @@ namespace osu.Game.Online.Notifications
             return fetchReq;
         }
 
-        protected void HandleJoinedChannel(Channel channel) => ChannelJoined?.Invoke(channel);
+        protected void HandleJoinedChannel(Channel channel)
+        {
+            channel.Joined.Value = true;
+            ChannelJoined?.Invoke(channel);
+        }
 
         protected void HandleChannelParted(Channel channel) => ChannelParted?.Invoke(channel);
 
diff --git a/osu.Game/Online/Notifications/WebSocket/WebSocketNotificationsClient.cs b/osu.Game/Online/Notifications/WebSocket/WebSocketNotificationsClient.cs
index c5b11ea94a..788847d368 100644
--- a/osu.Game/Online/Notifications/WebSocket/WebSocketNotificationsClient.cs
+++ b/osu.Game/Online/Notifications/WebSocket/WebSocketNotificationsClient.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.Net.WebSockets;
 using System.Text;
@@ -11,6 +12,7 @@ using Newtonsoft.Json;
 using osu.Framework.Extensions.TypeExtensions;
 using osu.Framework.Logging;
 using osu.Game.Online.API;
+using osu.Game.Online.API.Requests;
 using osu.Game.Online.Chat;
 
 namespace osu.Game.Online.Notifications.WebSocket
@@ -22,6 +24,7 @@ namespace osu.Game.Online.Notifications.WebSocket
     {
         private readonly ClientWebSocket socket;
         private readonly string endpoint;
+        private readonly ConcurrentDictionary<long, Channel> channelsMap = new ConcurrentDictionary<long, Channel>();
 
         public WebSocketNotificationsClient(ClientWebSocket socket, string endpoint, IAPIProvider api)
             : base(api)
@@ -110,7 +113,7 @@ namespace osu.Game.Online.Notifications.WebSocket
             await socket.SendAsync(Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(message)), WebSocketMessageType.Text, true, cancellationToken);
         }
 
-        private Task onMessageReceivedAsync(SocketMessage message)
+        private async Task onMessageReceivedAsync(SocketMessage message)
         {
             switch (message.Event)
             {
@@ -120,7 +123,6 @@ namespace osu.Game.Online.Notifications.WebSocket
                     Channel? joinedChannel = JsonConvert.DeserializeObject<Channel>(message.Data.ToString());
                     Debug.Assert(joinedChannel != null);
 
-                    joinedChannel.Joined.Value = true;
                     HandleJoinedChannel(joinedChannel);
                     break;
 
@@ -140,13 +142,32 @@ namespace osu.Game.Online.Notifications.WebSocket
                     Debug.Assert(messageData != null);
 
                     foreach (var msg in messageData.Messages)
-                        HandleJoinedChannel(new Channel { Id = msg.ChannelId });
+                        HandleJoinedChannel(await getChannel(msg.ChannelId));
 
                     HandleMessages(messageData.Messages);
                     break;
             }
+        }
 
-            return Task.CompletedTask;
+        private async Task<Channel> getChannel(long channelId)
+        {
+            if (channelsMap.TryGetValue(channelId, out Channel channel))
+                return channel;
+
+            var tsc = new TaskCompletionSource<Channel>();
+            var req = new GetChannelRequest(channelId);
+
+            req.Success += response =>
+            {
+                channelsMap[channelId] = response.Channel;
+                tsc.SetResult(response.Channel);
+            };
+
+            req.Failure += ex => tsc.SetException(ex);
+
+            API.Queue(req);
+
+            return await tsc.Task;
         }
 
         public override async ValueTask DisposeAsync()