From 4925a7d59e36f10e3b089287e0700a09362df8ce Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@craftplacer.moe>
Date: Sat, 5 Jun 2021 15:57:14 +0200
Subject: [PATCH] Minor code quality changes

---
 osu.Game/Online/Chat/MessageNotifier.cs | 27 ++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index c52a1876b1..53bd3c61c3 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -113,30 +113,47 @@ namespace osu.Game.Online.Chat
                 if (checkForPMs(channel, message))
                     continue;
 
-                // change output to bool again if another "message processor" is added.
-                checkForMentions(channel, message, localUser.Value.Username);
+                _ = checkForMentions(channel, message, localUser.Value.Username);
             }
         }
 
+        /// <summary>
+        /// Checks whether the user enabled private message notifications and whether specified <paramref name="message"/> is a direct message.
+        /// </summary>
+        /// <param name="channel">The channel associated to the <paramref name="message"/></param>
+        /// <param name="message">The message to be checked</param>
         private bool checkForPMs(Channel channel, Message message)
         {
             if (!notifyOnPM.Value || channel.Type != ChannelType.PM)
                 return false;
 
-            var notification = new PrivateMessageNotification(message.Sender.Username, channel);
+            if (channel.Id != message.ChannelId)
+                throw new ArgumentException("The provided channel doesn't match with the channel id provided by the message parameter.", nameof(channel));
 
+            var notification = new PrivateMessageNotification(message.Sender.Username, channel);
             notificationOverlay?.Post(notification);
 
             return true;
         }
 
-        private void checkForMentions(Channel channel, Message message, string username)
+        /// <summary>
+        /// Checks whether the user enabled mention notifications and whether specified <paramref name="message"/> mentions the provided <paramref name="username"/>.
+        /// </summary>
+        /// <param name="channel">The channel associated to the <paramref name="message"/></param>
+        /// <param name="message">The message to be checked</param>
+        /// <param name="username">The username that will be checked for</param>
+        private bool checkForMentions(Channel channel, Message message, string username)
         {
             if (!notifyOnMention.Value || !isMentioning(message.Content, username))
-                return;
+                return false;
+
+            if (channel.Id != message.ChannelId)
+                throw new ArgumentException("The provided channel doesn't match with the channel id provided by the message parameter.", nameof(channel));
 
             var notification = new MentionNotification(message.Sender.Username, channel);
             notificationOverlay?.Post(notification);
+
+            return true;
         }
 
         /// <summary>