From a679efac1c3b85e036965ca6cf7a8ba2558f9b77 Mon Sep 17 00:00:00 2001
From: Craftplacer <craftplacer@outlook.de>
Date: Thu, 27 May 2021 01:00:26 +0200
Subject: [PATCH] Reduce duplicate notification code by making a base class

---
 osu.Game/Online/Chat/MessageNotifier.cs | 39 +++++++++----------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index 1f3fc0946b..47758673bb 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -142,12 +142,10 @@ private void checkForMentions(Channel channel, Message message, string username)
         /// <returns>If the <paramref name="message"/> mentions the <paramref name="username"/></returns>
         private static bool isMentioning(string message, string username) => message.IndexOf(username, StringComparison.OrdinalIgnoreCase) != -1 || message.IndexOf(username.Replace(' ', '_'), StringComparison.OrdinalIgnoreCase) != -1;
 
-        public class PrivateMessageNotification : SimpleNotification
+        public class OpenChannelNotification : SimpleNotification
         {
-            public PrivateMessageNotification(string username, Channel channel)
+            public OpenChannelNotification(Channel channel)
             {
-                Icon = FontAwesome.Solid.Envelope;
-                Text = $"You received a private message from '{username}'. Click to read it!";
                 this.channel = channel;
             }
 
@@ -171,32 +169,21 @@ private void load(OsuColour colours, ChatOverlay chatOverlay, NotificationOverla
             }
         }
 
-        public class MentionNotification : SimpleNotification
+        public class PrivateMessageNotification : OpenChannelNotification
         {
-            public MentionNotification(string username, Channel channel)
+            public PrivateMessageNotification(string username, Channel channel) : base(channel)
+            {
+                Icon = FontAwesome.Solid.Envelope;
+                Text = $"You received a private message from '{username}'. Click to read it!";
+            }
+        }
+
+        public class MentionNotification : OpenChannelNotification
+        {
+            public MentionNotification(string username, Channel channel) : base(channel)
             {
                 Icon = FontAwesome.Solid.At;
                 Text = $"Your name was mentioned in chat by '{username}'. Click to find out why!";
-                this.channel = channel;
-            }
-
-            private readonly Channel channel;
-
-            public override bool IsImportant => false;
-
-            [BackgroundDependencyLoader]
-            private void load(OsuColour colours, ChatOverlay chatOverlay, NotificationOverlay notificationOverlay, ChannelManager channelManager)
-            {
-                IconBackgound.Colour = colours.PurpleDark;
-
-                Activated = delegate
-                {
-                    notificationOverlay.Hide();
-                    chatOverlay.Show();
-                    channelManager.CurrentChannel.Value = channel;
-
-                    return true;
-                };
             }
         }
     }