From 139401a04a4813072362d6807271cc07e01b0e22 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 11 Jun 2021 16:27:31 +0900
Subject: [PATCH] Inline and refactor overly verbose `MessageNotifier` code

---
 osu.Game/Online/Chat/MessageNotifier.cs | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index 53bd3c61c3..685545f08c 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -45,8 +45,7 @@ private void load(OsuConfigManager config, IAPIProvider api)
             notifyOnPM = config.GetBindable<bool>(OsuSetting.ChatMessageNotification);
             localUser.BindTo(api.LocalUser);
 
-            // Listen for new messages
-            joinedChannels.CollectionChanged += channelsChanged;
+            joinedChannels.BindCollectionChanged(channelsChanged);
             joinedChannels.BindTo(channelManager.JoinedChannels);
         }
 
@@ -70,28 +69,14 @@ private void channelsChanged(object sender, NotifyCollectionChangedEventArgs e)
 
         private void newMessagesArrived(IEnumerable<Message> messages)
         {
-            if (messages == null || !messages.Any())
+            if (!messages.Any())
                 return;
 
-            HandleMessages(messages.First().ChannelId, messages);
-        }
-
-        /// <summary>
-        /// Searches for a channel with the matching <paramref name="channelId"/>, returns <see langword="null"/> when none found.
-        /// </summary>
-        private Channel fetchJoinedChannel(long channelId)
-        {
-            return channelManager.JoinedChannels.SingleOrDefault(c => c.Id == channelId);
-        }
-
-        public void HandleMessages(long channelId, IEnumerable<Message> messages)
-        {
-            // Fetch channel object
-            var channel = fetchJoinedChannel(channelId);
+            var channel = channelManager.JoinedChannels.SingleOrDefault(c => c.Id == messages.First().ChannelId);
 
             if (channel == null)
             {
-                Logger.Log($"Couldn't resolve channel id {channelId}", LoggingTarget.Information);
+                Logger.Log($"Couldn't resolve channel id {messages.First().ChannelId}", LoggingTarget.Information);
                 return;
             }