From 0901333ef3d1cda32dca3fe26e8513679ed01147 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 8 Aug 2021 17:20:46 +0700
Subject: [PATCH 01/32] add pinned property in comment

---
 osu.Game/Online/API/Requests/Responses/Comment.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/API/Requests/Responses/Comment.cs b/osu.Game/Online/API/Requests/Responses/Comment.cs
index 05a24cec0e..32d489432d 100644
--- a/osu.Game/Online/API/Requests/Responses/Comment.cs
+++ b/osu.Game/Online/API/Requests/Responses/Comment.cs
@@ -58,6 +58,9 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"edited_by_id")]
         public long? EditedById { get; set; }
 
+        [JsonProperty(@"pinned")]
+        public bool Pinned { get; set; }
+
         public User EditedUser { get; set; }
 
         public bool IsTopLevel => !ParentId.HasValue;

From ff860b90a936d89cf0b251e8c8e866e52a884bd7 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 8 Aug 2021 17:21:02 +0700
Subject: [PATCH 02/32] add pinned test case for drawable comment

---
 osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
index 7b741accbb..5d1f3affc6 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
@@ -43,6 +43,9 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep(description, () =>
             {
+                if (description == "Pinned")
+                    comment.Pinned = true;
+
                 comment.Message = text;
                 container.Add(new DrawableComment(comment));
             });
@@ -59,6 +62,7 @@ namespace osu.Game.Tests.Visual.Online
         private static object[] comments =
         {
             new[] { "Plain", "This is plain comment" },
+            new[] { "Pinned", "This is pinned comment" },
             new[] { "Link", "Please visit https://osu.ppy.sh" },
 
             new[]

From 1859e651b67760356d5ada53fc36570cc69acaa5 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sun, 8 Aug 2021 17:21:29 +0700
Subject: [PATCH 03/32] add pinned mark in drawable comment

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 3520b15b1e..389e61bc30 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -21,6 +21,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
 using System.Collections.Specialized;
 using osu.Framework.Localisation;
 using osu.Game.Overlays.Comments.Buttons;
+using osu.Game.Resources.Localisation.Web;
 
 namespace osu.Game.Overlays.Comments
 {
@@ -143,6 +144,26 @@ namespace osu.Game.Overlays.Comments
                                                         {
                                                             AutoSizeAxes = Axes.Both
                                                         },
+                                                        new FillFlowContainer
+                                                        {
+                                                            AutoSizeAxes = Axes.Both,
+                                                            Direction = FillDirection.Horizontal,
+                                                            Spacing = new Vector2(3, 0),
+                                                            Alpha = Comment.Pinned ? 1 : 0,
+                                                            Children = new Drawable[]
+                                                            {
+                                                                new SpriteIcon
+                                                                {
+                                                                    Icon = FontAwesome.Solid.Thumbtack,
+                                                                    Size = new Vector2(14),
+                                                                },
+                                                                new OsuSpriteText
+                                                                {
+                                                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
+                                                                    Text = CommentsStrings.Pinned,
+                                                                }
+                                                            },
+                                                        },
                                                         new ParentUsername(Comment),
                                                         new OsuSpriteText
                                                         {

From 39b13efdd58953eaf1ae0548d8be87ab89c6d68e Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 13 Aug 2021 13:13:28 +0700
Subject: [PATCH 04/32] add pinned comments property in comment bundle

---
 osu.Game/Online/API/Requests/Responses/CommentBundle.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
index d76ede67cd..0585d75f0c 100644
--- a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
+++ b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
@@ -24,6 +24,9 @@ namespace osu.Game.Online.API.Requests.Responses
         [JsonProperty(@"included_comments")]
         public List<Comment> IncludedComments { get; set; }
 
+        [JsonProperty(@"pinned_comments")]
+        public List<Comment> PinnedComments { get; set; }
+
         private List<long> userVotes;
 
         [JsonProperty(@"user_votes")]

From e3f91413cf0397c68c37b043a10fe5a04a2e89fe Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 13 Aug 2021 13:23:34 +0700
Subject: [PATCH 05/32] add pinned comment test case for comment container

---
 .../Online/TestSceneCommentsContainer.cs      | 106 ++++++++++++------
 1 file changed, 71 insertions(+), 35 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index cd22bb2513..3ad3474fc0 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -42,19 +42,21 @@ namespace osu.Game.Tests.Visual.Online
                 () => commentsContainer.ChildrenOfType<CommentsShowMoreButton>().Single().IsLoading);
         }
 
-        [Test]
-        public void TestSingleCommentsPage()
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestSingleCommentsPage(bool withPinned)
         {
-            setUpCommentsResponse(exampleComments);
+            setUpCommentsResponse(getExampleComments(withPinned));
             AddStep("show comments", () => commentsContainer.ShowComments(CommentableType.Beatmapset, 123));
             AddUntilStep("show more button hidden",
                 () => commentsContainer.ChildrenOfType<CommentsShowMoreButton>().Single().Alpha == 0);
         }
 
-        [Test]
-        public void TestMultipleCommentPages()
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestMultipleCommentPages(bool withPinned)
         {
-            var comments = exampleComments;
+            var comments = getExampleComments(withPinned);
             comments.HasMore = true;
             comments.TopLevelCount = 10;
 
@@ -64,11 +66,12 @@ namespace osu.Game.Tests.Visual.Online
                 () => commentsContainer.ChildrenOfType<CommentsShowMoreButton>().Single().Alpha == 1);
         }
 
-        [Test]
-        public void TestMultipleLoads()
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestMultipleLoads(bool withPinned)
         {
-            var comments = exampleComments;
-            int topLevelCommentCount = exampleComments.Comments.Count;
+            var comments = getExampleComments(withPinned);
+            int topLevelCommentCount = comments.Comments.Count;
 
             AddStep("hide container", () => commentsContainer.Hide());
             setUpCommentsResponse(comments);
@@ -92,38 +95,71 @@ namespace osu.Game.Tests.Visual.Online
                 };
             });
 
-        private CommentBundle exampleComments => new CommentBundle
+        private CommentBundle getExampleComments(bool withPinned = false)
         {
-            Comments = new List<Comment>
+            var bundle = new CommentBundle
             {
-                new Comment
+                Comments = new List<Comment>
                 {
-                    Id = 1,
-                    Message = "This is a comment",
-                    LegacyName = "FirstUser",
-                    CreatedAt = DateTimeOffset.Now,
-                    VotesCount = 19,
-                    RepliesCount = 1
+                    new Comment
+                    {
+                        Id = 1,
+                        Message = "This is a comment",
+                        LegacyName = "FirstUser",
+                        CreatedAt = DateTimeOffset.Now,
+                        VotesCount = 19,
+                        RepliesCount = 1
+                    },
+                    new Comment
+                    {
+                        Id = 5,
+                        ParentId = 1,
+                        Message = "This is a child comment",
+                        LegacyName = "SecondUser",
+                        CreatedAt = DateTimeOffset.Now,
+                        VotesCount = 4,
+                    },
+                    new Comment
+                    {
+                        Id = 10,
+                        Message = "This is another comment",
+                        LegacyName = "ThirdUser",
+                        CreatedAt = DateTimeOffset.Now,
+                        VotesCount = 0
+                    },
                 },
-                new Comment
+                IncludedComments = new List<Comment>(),
+                PinnedComments = new List<Comment>(),
+            };
+
+            if (withPinned)
+            {
+                var pinnedComment = new Comment
                 {
-                    Id = 5,
-                    ParentId = 1,
-                    Message = "This is a child comment",
-                    LegacyName = "SecondUser",
+                    Id = 15,
+                    Message = "This is pinned comment",
+                    LegacyName = "PinnedUser",
                     CreatedAt = DateTimeOffset.Now,
-                    VotesCount = 4,
-                },
-                new Comment
+                    VotesCount = 999,
+                    Pinned = true,
+                    RepliesCount = 1,
+                };
+
+                bundle.Comments.Add(pinnedComment);
+                bundle.PinnedComments.Add(pinnedComment);
+
+                bundle.Comments.Add(new Comment
                 {
-                    Id = 10,
-                    Message = "This is another comment",
-                    LegacyName = "ThirdUser",
+                    Id = 20,
+                    Message = "Reply to pinned comment",
+                    LegacyName = "AbandonedUser",
                     CreatedAt = DateTimeOffset.Now,
-                    VotesCount = 0
-                },
-            },
-            IncludedComments = new List<Comment>(),
-        };
+                    VotesCount = 0,
+                    ParentId = 15,
+                });
+            }
+
+            return bundle;
+        }
     }
 }

From 480d5ffa5d1370539f10c69ca3a05450e8a7a5ad Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 13 Aug 2021 19:22:46 +0700
Subject: [PATCH 06/32] add pinned comment to users setter in comment bundle

---
 .../API/Requests/Responses/CommentBundle.cs   | 26 +++++++------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
index 0585d75f0c..4070df493d 100644
--- a/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
+++ b/osu.Game/Online/API/Requests/Responses/CommentBundle.cs
@@ -4,6 +4,7 @@
 using Newtonsoft.Json;
 using osu.Game.Users;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace osu.Game.Online.API.Requests.Responses
 {
@@ -52,26 +53,17 @@ namespace osu.Game.Online.API.Requests.Responses
             {
                 users = value;
 
-                value.ForEach(u =>
+                foreach (var user in value)
                 {
-                    Comments.ForEach(c =>
+                    foreach (var comment in Comments.Concat(IncludedComments).Concat(PinnedComments))
                     {
-                        if (c.UserId == u.Id)
-                            c.User = u;
+                        if (comment.UserId == user.Id)
+                            comment.User = user;
 
-                        if (c.EditedById == u.Id)
-                            c.EditedUser = u;
-                    });
-
-                    IncludedComments.ForEach(c =>
-                    {
-                        if (c.UserId == u.Id)
-                            c.User = u;
-
-                        if (c.EditedById == u.Id)
-                            c.EditedUser = u;
-                    });
-                });
+                        if (comment.EditedById == user.Id)
+                            comment.EditedUser = user;
+                    }
+                }
             }
         }
 

From cf0e9a1eec242658bddb152bd47ae51adc3e29d5 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 13 Aug 2021 19:01:52 +0700
Subject: [PATCH 07/32] add pinned content section

---
 .../Overlays/Comments/CommentsContainer.cs    | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index fe8d6f0178..9abae63f93 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -38,6 +38,7 @@ namespace osu.Game.Overlays.Comments
         private CancellationTokenSource loadCancellation;
         private int currentPage;
 
+        private FillFlowContainer pinnedContent;
         private FillFlowContainer content;
         private DeletedCommentsCounter deletedCommentsCounter;
         private CommentsShowMoreButton moreButton;
@@ -63,6 +64,25 @@ namespace osu.Game.Overlays.Comments
                     Children = new Drawable[]
                     {
                         commentCounter = new TotalCommentsCounter(),
+                        new Container
+                        {
+                            RelativeSizeAxes = Axes.X,
+                            AutoSizeAxes = Axes.Y,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = colourProvider.Background4,
+                                },
+                                pinnedContent = new FillFlowContainer
+                                {
+                                    RelativeSizeAxes = Axes.X,
+                                    AutoSizeAxes = Axes.Y,
+                                    Direction = FillDirection.Vertical,
+                                },
+                            },
+                        },
                         new CommentsHeader
                         {
                             Sort = { BindTarget = Sort },
@@ -173,6 +193,7 @@ namespace osu.Game.Overlays.Comments
             deletedCommentsCounter.Count.Value = 0;
             moreButton.Show();
             moreButton.IsLoading = true;
+            pinnedContent.Clear();
             content.Clear();
             CommentDictionary.Clear();
         }
@@ -202,7 +223,7 @@ namespace osu.Game.Overlays.Comments
             var topLevelComments = new List<DrawableComment>();
             var orphaned = new List<Comment>();
 
-            foreach (var comment in bundle.Comments.Concat(bundle.IncludedComments))
+            foreach (var comment in bundle.Comments.Concat(bundle.IncludedComments).Concat(bundle.PinnedComments))
             {
                 // Exclude possible duplicated comments.
                 if (CommentDictionary.ContainsKey(comment.Id))
@@ -219,13 +240,15 @@ namespace osu.Game.Overlays.Comments
             {
                 LoadComponentsAsync(topLevelComments, loaded =>
                 {
-                    content.AddRange(loaded);
+                    pinnedContent.AddRange(loaded.Where(d => d.Comment.Pinned));
+                    content.AddRange(loaded.Where(d => !d.Comment.Pinned));
 
                     deletedCommentsCounter.Count.Value += topLevelComments.Select(d => d.Comment).Count(c => c.IsDeleted && c.IsTopLevel);
 
                     if (bundle.HasMore)
                     {
                         int loadedTopLevelComments = 0;
+                        pinnedContent.Children.OfType<DrawableComment>().ForEach(p => loadedTopLevelComments++);
                         content.Children.OfType<DrawableComment>().ForEach(p => loadedTopLevelComments++);
 
                         moreButton.Current.Value = bundle.TopLevelCount - loadedTopLevelComments;

From 6d726bf0465233ba78665fa3a5a888eeca833301 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 13 Aug 2021 22:54:41 +0700
Subject: [PATCH 08/32] Change spacing

Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
---
 osu.Game/Overlays/Comments/DrawableComment.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 389e61bc30..9937623418 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -148,7 +148,7 @@ namespace osu.Game.Overlays.Comments
                                                         {
                                                             AutoSizeAxes = Axes.Both,
                                                             Direction = FillDirection.Horizontal,
-                                                            Spacing = new Vector2(3, 0),
+                                                            Spacing = new Vector2(2, 0),
                                                             Alpha = Comment.Pinned ? 1 : 0,
                                                             Children = new Drawable[]
                                                             {

From 1c32993fe51c56876ce0797d8a5151af471b87c3 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 13 Aug 2021 23:03:42 +0700
Subject: [PATCH 09/32] initialize pinned comments in test offline comment

---
 .../Visual/Online/TestSceneOfflineCommentsContainer.cs          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneOfflineCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneOfflineCommentsContainer.cs
index 628ae0971b..4f7947b69c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneOfflineCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneOfflineCommentsContainer.cs
@@ -149,6 +149,7 @@ namespace osu.Game.Tests.Visual.Online
                 }
             },
             IncludedComments = new List<Comment>(),
+            PinnedComments = new List<Comment>(),
             UserVotes = new List<long>
             {
                 5
@@ -178,6 +179,7 @@ namespace osu.Game.Tests.Visual.Online
                 },
             },
             IncludedComments = new List<Comment>(),
+            PinnedComments = new List<Comment>(),
         };
 
         private class TestCommentsContainer : CommentsContainer

From 48b84db7b978337329083af3c7e9fdd73012c318 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Fri, 13 Aug 2021 23:48:14 +0700
Subject: [PATCH 10/32] add no comment and single comment test

---
 .../Online/TestSceneCommentsContainer.cs      | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 3ad3474fc0..4809a737d9 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -82,6 +82,48 @@ namespace osu.Game.Tests.Visual.Online
                 () => commentsContainer.ChildrenOfType<DrawableComment>().Count() == topLevelCommentCount);
         }
 
+        [Test]
+        public void TestNoComment()
+        {
+            var comments = getExampleComments();
+            comments.Comments.Clear();
+
+            setUpCommentsResponse(comments);
+            AddStep("show comments", () => commentsContainer.ShowComments(CommentableType.Beatmapset, 123));
+            AddAssert("no comment showed", () => !commentsContainer.ChildrenOfType<DrawableComment>().Any());
+        }
+
+        [TestCase(false)]
+        [TestCase(true)]
+        public void TestSingleComment(bool withPinned)
+        {
+            var comment = new Comment
+            {
+                Id = 1,
+                Message = "This is a single comment",
+                LegacyName = "SingleUser",
+                CreatedAt = DateTimeOffset.Now,
+                VotesCount = 0,
+                Pinned = withPinned,
+            };
+
+            var bundle = new CommentBundle
+            {
+                Comments = new List<Comment> { comment },
+                IncludedComments = new List<Comment>(),
+                PinnedComments = new List<Comment>(),
+            };
+
+            if (withPinned)
+                bundle.PinnedComments.Add(comment);
+
+            setUpCommentsResponse(bundle);
+            AddStep("show comments", () => commentsContainer.ShowComments(CommentableType.Beatmapset, 123));
+            AddUntilStep("wait comment load", () => commentsContainer.ChildrenOfType<DrawableComment>().Any());
+            AddAssert("only one comment showed", () =>
+                commentsContainer.ChildrenOfType<DrawableComment>().Count(d => d.Comment.Pinned == withPinned) == 1);
+        }
+
         private void setUpCommentsResponse(CommentBundle commentBundle)
             => AddStep("set up response", () =>
             {

From a710bbf6aec07f404d149a686552694b54aa227e Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sat, 14 Aug 2021 00:03:05 +0700
Subject: [PATCH 11/32] remove background colour for no comment placeholder

---
 osu.Game/Overlays/Comments/CommentsContainer.cs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 9abae63f93..6b3d816e84 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -323,11 +323,6 @@ namespace osu.Game.Overlays.Comments
                 RelativeSizeAxes = Axes.X;
                 AddRangeInternal(new Drawable[]
                 {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = colourProvider.Background4
-                    },
                     new OsuSpriteText
                     {
                         Anchor = Anchor.CentreLeft,

From 4494ff55e325f96227e8c278d4ac4d759edc1833 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sat, 14 Aug 2021 00:17:45 +0700
Subject: [PATCH 12/32] fix pinned drawable comment test

---
 osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
index 5d1f3affc6..b26850feb2 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneDrawableComment.cs
@@ -43,9 +43,7 @@ namespace osu.Game.Tests.Visual.Online
         {
             AddStep(description, () =>
             {
-                if (description == "Pinned")
-                    comment.Pinned = true;
-
+                comment.Pinned = description == "Pinned";
                 comment.Message = text;
                 container.Add(new DrawableComment(comment));
             });

From 9233f396aa0787ce9843fe3fcfad3dfe6dd8760b Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Sat, 14 Aug 2021 00:22:01 +0700
Subject: [PATCH 13/32] centered thumbtack icon and text

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 9937623418..d80d566f3a 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -156,11 +156,15 @@ namespace osu.Game.Overlays.Comments
                                                                 {
                                                                     Icon = FontAwesome.Solid.Thumbtack,
                                                                     Size = new Vector2(14),
+                                                                    Anchor = Anchor.CentreLeft,
+                                                                    Origin = Anchor.CentreLeft,
                                                                 },
                                                                 new OsuSpriteText
                                                                 {
                                                                     Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
                                                                     Text = CommentsStrings.Pinned,
+                                                                    Anchor = Anchor.CentreLeft,
+                                                                    Origin = Anchor.CentreLeft,
                                                                 }
                                                             },
                                                         },

From 3d402d9e788c1406eb997344887dc7ff4eb36da0 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 22 Aug 2021 10:13:34 +0800
Subject: [PATCH 14/32] List incompatible mods in tooltip of mod button

---
 osu.Game/Overlays/Mods/ModButton.cs        |   6 +-
 osu.Game/Overlays/Mods/ModButtonTooltip.cs | 145 +++++++++++++++++++++
 2 files changed, 150 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game/Overlays/Mods/ModButtonTooltip.cs

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 572ff0d1aa..88cc706766 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.Mods
     /// <summary>
     /// Represents a clickable button which can cycle through one of more mods.
     /// </summary>
-    public class ModButton : ModButtonEmpty, IHasTooltip
+    public class ModButton : ModButtonEmpty, IHasCustomTooltip
     {
         private ModIcon foregroundIcon;
         private ModIcon backgroundIcon;
@@ -308,5 +308,9 @@ namespace osu.Game.Overlays.Mods
 
             Mod = mod;
         }
+
+        public ITooltip GetCustomTooltip() => new ModButtonTooltip();
+
+        public object TooltipContent => SelectedMod ?? Mods[0];
     }
 }
diff --git a/osu.Game/Overlays/Mods/ModButtonTooltip.cs b/osu.Game/Overlays/Mods/ModButtonTooltip.cs
new file mode 100644
index 0000000000..2a3160e779
--- /dev/null
+++ b/osu.Game/Overlays/Mods/ModButtonTooltip.cs
@@ -0,0 +1,145 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Graphics;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.UI;
+using osu.Game.Screens.Play.HUD;
+using osuTK;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class ModButtonTooltip : VisibilityContainer, ITooltip
+    {
+        private readonly OsuSpriteText descriptionText;
+        private readonly Box background;
+        private readonly OsuSpriteText incompatibleText;
+
+        private readonly Bindable<IReadOnlyList<Mod>> incompatibleMods = new Bindable<IReadOnlyList<Mod>>();
+
+        [Resolved]
+        private Bindable<RulesetInfo> ruleset { get; set; }
+
+        public ModButtonTooltip()
+        {
+            AutoSizeAxes = Axes.Both;
+            Masking = true;
+            CornerRadius = 5;
+
+            Children = new Drawable[]
+            {
+                background = new Box
+                {
+                    RelativeSizeAxes = Axes.Both
+                },
+                new FillFlowContainer
+                {
+                    AutoSizeAxes = Axes.Both,
+                    Direction = FillDirection.Vertical,
+                    Padding = new MarginPadding { Left = 10, Right = 10, Top = 5, Bottom = 5 },
+                    Children = new Drawable[]
+                    {
+                        descriptionText = new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(weight: FontWeight.Regular),
+                            Margin = new MarginPadding { Bottom = 5 }
+                        },
+                        incompatibleText = new OsuSpriteText
+                        {
+                            Font = OsuFont.GetFont(weight: FontWeight.Regular),
+                            Text = "Incompatible with:"
+                        },
+                        new ModDisplay
+                        {
+                            Current = incompatibleMods,
+                            ExpansionMode = ExpansionMode.AlwaysExpanded,
+                            Scale = new Vector2(0.7f)
+                        }
+                    }
+                },
+            };
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            background.Colour = colours.Gray3;
+            descriptionText.Colour = colours.BlueLighter;
+            incompatibleText.Colour = colours.BlueLight;
+        }
+
+        protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
+        protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
+
+        private Drawable getModItem(Mod mod)
+        {
+            return new FillFlowContainer
+            {
+                Anchor = Anchor.CentreLeft,
+                Origin = Anchor.CentreLeft,
+                AutoSizeAxes = Axes.Both,
+                Direction = FillDirection.Horizontal,
+                Children = new Drawable[]
+                {
+                    new ModIcon(mod, false)
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        AutoSizeAxes = Axes.Both,
+                        Scale = new Vector2(0.4f)
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                        Margin = new MarginPadding { Left = 5 },
+                        Font = OsuFont.GetFont(weight: FontWeight.Regular),
+                        Text = mod.Name,
+                    },
+                }
+            };
+        }
+
+        private string lastMod;
+
+        public bool SetContent(object content)
+        {
+            if (!(content is Mod mod))
+                return false;
+
+            if (mod.Acronym == lastMod) return true;
+
+            lastMod = mod.Acronym;
+
+            descriptionText.Text = mod.Description;
+
+            var incompatibleTypes = mod.IncompatibleMods;
+
+            var allMods = ruleset.Value.CreateInstance().GetAllMods();
+
+            incompatibleMods.Value = allMods.Where(m => incompatibleTypes.Any(t => t.IsInstanceOfType(m))).ToList();
+
+            if (!incompatibleMods.Value.Any())
+            {
+                incompatibleText.Text = "Compatible with all mods";
+                return true;
+            }
+
+            incompatibleText.Text = "Incompatible with:";
+
+            return true;
+        }
+
+        public void Move(Vector2 pos) => Position = pos;
+    }
+}

From ef6faf04be40955911b288d2b9b57b8cf21c7a10 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 22 Aug 2021 10:22:18 +0800
Subject: [PATCH 15/32] Use FirstOrDefault in TooltipContent

---
 osu.Game/Overlays/Mods/ModButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 88cc706766..9ad867c58a 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -311,6 +311,6 @@ namespace osu.Game.Overlays.Mods
 
         public ITooltip GetCustomTooltip() => new ModButtonTooltip();
 
-        public object TooltipContent => SelectedMod ?? Mods[0];
+        public object TooltipContent => SelectedMod ?? Mods.FirstOrDefault();
     }
 }

From e213562b2a908b30a19b17e6182a08d9aa74c653 Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 22 Aug 2021 11:01:17 +0800
Subject: [PATCH 16/32] Add a red tint on mods incompatible with the current
 selection

---
 osu.Game/Overlays/Mods/ModButton.cs        | 38 +++++++++++++++++++++-
 osu.Game/Overlays/Mods/ModButtonTooltip.cs |  2 +-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 9ad867c58a..359d1a7981 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -11,12 +11,16 @@ using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.UI;
 using System;
+using System.Collections.Generic;
 using System.Linq;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Input.Events;
 using osu.Framework.Localisation;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
+using osu.Game.Utils;
 
 namespace osu.Game.Overlays.Mods
 {
@@ -43,6 +47,9 @@ namespace osu.Game.Overlays.Mods
         // A selected index of -1 means not selected.
         private int selectedIndex = -1;
 
+        [Resolved]
+        private Bindable<IReadOnlyList<Mod>> globalSelectedMods { get; set; }
+
         /// <summary>
         /// Change the selected mod index of this button.
         /// </summary>
@@ -236,7 +243,28 @@ namespace osu.Game.Overlays.Mods
                 backgroundIcon.Mod = foregroundIcon.Mod;
             foregroundIcon.Mod = mod;
             text.Text = mod.Name;
-            Colour = mod.HasImplementation ? Color4.White : Color4.Gray;
+            updateColour(mod);
+        }
+
+        private Colour4 lightRed;
+        private Colour4 darkRed;
+
+        private void updateColour(Mod mod)
+        {
+            var baseColour = mod.HasImplementation ? Color4.White : Color4.Gray;
+
+            if (globalSelectedMods != null)
+            {
+                if (!globalSelectedMods.Value.Contains(mod))
+                {
+                    if (!ModUtils.CheckCompatibleSet(globalSelectedMods.Value.Concat(new[] { mod })))
+                    {
+                        baseColour = mod.HasImplementation ? lightRed : darkRed;
+                    }
+                }
+            }
+
+            Colour = baseColour;
         }
 
         private void createIcons()
@@ -309,6 +337,14 @@ namespace osu.Game.Overlays.Mods
             Mod = mod;
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colour)
+        {
+            lightRed = colour.RedLight;
+            darkRed = colour.RedDark;
+            globalSelectedMods.BindValueChanged(_ => updateColour(SelectedMod ?? Mods.FirstOrDefault()), true);
+        }
+
         public ITooltip GetCustomTooltip() => new ModButtonTooltip();
 
         public object TooltipContent => SelectedMod ?? Mods.FirstOrDefault();
diff --git a/osu.Game/Overlays/Mods/ModButtonTooltip.cs b/osu.Game/Overlays/Mods/ModButtonTooltip.cs
index 2a3160e779..3383ad2d99 100644
--- a/osu.Game/Overlays/Mods/ModButtonTooltip.cs
+++ b/osu.Game/Overlays/Mods/ModButtonTooltip.cs
@@ -127,7 +127,7 @@ namespace osu.Game.Overlays.Mods
 
             var allMods = ruleset.Value.CreateInstance().GetAllMods();
 
-            incompatibleMods.Value = allMods.Where(m => incompatibleTypes.Any(t => t.IsInstanceOfType(m))).ToList();
+            incompatibleMods.Value = allMods.Where(m => m.GetType() != mod.GetType() && incompatibleTypes.Any(t => t.IsInstanceOfType(m))).ToList();
 
             if (!incompatibleMods.Value.Any())
             {

From 0bbddd297c9bc0ea1201005d761cf7b3f78ead0b Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Sun, 22 Aug 2021 11:05:53 +0800
Subject: [PATCH 17/32] Remove unused code

---
 osu.Game/Overlays/Mods/ModButtonTooltip.cs | 30 ----------------------
 1 file changed, 30 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButtonTooltip.cs b/osu.Game/Overlays/Mods/ModButtonTooltip.cs
index 3383ad2d99..1b889281f0 100644
--- a/osu.Game/Overlays/Mods/ModButtonTooltip.cs
+++ b/osu.Game/Overlays/Mods/ModButtonTooltip.cs
@@ -13,7 +13,6 @@ using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
-using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Play.HUD;
 using osuTK;
 
@@ -81,35 +80,6 @@ namespace osu.Game.Overlays.Mods
         protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
         protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
 
-        private Drawable getModItem(Mod mod)
-        {
-            return new FillFlowContainer
-            {
-                Anchor = Anchor.CentreLeft,
-                Origin = Anchor.CentreLeft,
-                AutoSizeAxes = Axes.Both,
-                Direction = FillDirection.Horizontal,
-                Children = new Drawable[]
-                {
-                    new ModIcon(mod, false)
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        AutoSizeAxes = Axes.Both,
-                        Scale = new Vector2(0.4f)
-                    },
-                    new OsuSpriteText
-                    {
-                        Anchor = Anchor.CentreLeft,
-                        Origin = Anchor.CentreLeft,
-                        Margin = new MarginPadding { Left = 5 },
-                        Font = OsuFont.GetFont(weight: FontWeight.Regular),
-                        Text = mod.Name,
-                    },
-                }
-            };
-        }
-
         private string lastMod;
 
         public bool SetContent(object content)

From fed0e15cea3f331722ece7b1a0f805eef16a5ad9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Aug 2021 20:23:46 +0900
Subject: [PATCH 18/32] Fix typo in `ArchiveModelManager`

---
 osu.Game/Database/ArchiveModelManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index 87bf54f981..ddd2bc5d1e 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -806,7 +806,7 @@ namespace osu.Game.Database
         protected TModel CheckForExisting(TModel model) => model.Hash == null ? null : ModelStore.ConsumableItems.FirstOrDefault(b => b.Hash == model.Hash);
 
         /// <summary>
-        /// Whether inport can be skipped after finding an existing import early in the process.
+        /// Whether import can be skipped after finding an existing import early in the process.
         /// Only valid when <see cref="ComputeHash"/> is not overridden.
         /// </summary>
         /// <param name="existing">The existing model.</param>

From 7b3f7cc7c1e4534afdd96cf2c97499b418e4a1c4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Aug 2021 20:24:00 +0900
Subject: [PATCH 19/32] Change skin import to also include directory names in
 the skin name where appropriate

---
 osu.Game/Skinning/SkinManager.cs | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 0f805990b9..0aa1c62d04 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -136,18 +136,19 @@ namespace osu.Game.Skinning
 
         protected override string ComputeHash(SkinInfo item, ArchiveReader reader = null)
         {
-            // we need to populate early to create a hash based off skin.ini contents
-            if (item.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
-                populateMetadata(item, GetSkin(item));
+            var instance = GetSkin(item);
 
-            if (item.Creator != null && item.Creator != unknown_creator_string)
+            // in the case the skin has a skin.ini file, we are going to create a hash based on that.
+            // we don't want to do this in the case we don't have a skin.ini, as it would match only on the filename portion,
+            // causing potentially unique skin imports to be considered as a duplicate.
+            if (!string.IsNullOrEmpty(instance.Configuration.SkinInfo.Name))
             {
-                // this is the optimal way to hash legacy skins, but will need to be reconsidered when we move forward with skin implementation.
-                // likely, the skin should expose a real version (ie. the version of the skin, not the skin.ini version it's targeting).
+                // we need to populate early to create a hash based off skin.ini contents
+                populateMetadata(item, instance, reader?.Name);
+
                 return item.ToString().ComputeSHA2Hash();
             }
 
-            // if there was no creator, the ToString above would give the filename, which alone isn't really enough to base any decisions on.
             return base.ComputeHash(item, reader);
         }
 
@@ -157,13 +158,12 @@ namespace osu.Game.Skinning
 
             model.InstantiationInfo ??= instance.GetType().GetInvariantInstantiationInfo();
 
-            if (model.Name?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true)
-                populateMetadata(model, instance);
+            populateMetadata(model, instance, archive?.Name);
 
             return Task.CompletedTask;
         }
 
-        private void populateMetadata(SkinInfo item, Skin instance)
+        private void populateMetadata(SkinInfo item, Skin instance, string archiveName)
         {
             if (!string.IsNullOrEmpty(instance.Configuration.SkinInfo.Name))
             {
@@ -175,6 +175,13 @@ namespace osu.Game.Skinning
                 item.Name = item.Name.Replace(".osk", "", StringComparison.OrdinalIgnoreCase);
                 item.Creator ??= unknown_creator_string;
             }
+
+            // generally when importing from a folder, the ".osk" extension will not be present.
+            // if we ever need a more reliable method of determining this, the type of `ArchiveReader` can be checked.
+            bool isArchiveImport = archiveName?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true;
+
+            if (archiveName != null && !isArchiveImport && archiveName != item.Name)
+                item.Name = $"{item.Name} ({archiveName})";
         }
 
         /// <summary>

From 0cbe95d6611c0a6921c6be892f9db02af3735bc4 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Aug 2021 20:25:46 +0900
Subject: [PATCH 20/32] Add test coverage of different folder names with same
 skin.ini

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 36 +++++++++++++++++++----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index bab8dfc983..0329ca11e2 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -138,16 +138,38 @@ namespace osu.Game.Tests.Skins.IO
             }
         }
 
-        private MemoryStream createOsk(string name, string author)
+        [Test]
+        public async Task TestSameMetadataNameDifferentFolderName()
+        {
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(ImportSkinTest)))
+            {
+                try
+                {
+                    var osu = LoadOsuIntoHost(host);
+
+                    var imported = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("name 1", "author 1", false), "my custom skin 1"));
+
+                    var imported2 = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("name 1", "author 1", false), "my custom skin 2"));
+
+                    Assert.That(imported2.Hash, Is.Not.EqualTo(imported.Hash));
+                }
+                finally
+                {
+                    host.Exit();
+                }
+            }
+        }
+
+        private MemoryStream createOsk(string name, string author, bool makeUnique = true)
         {
             var zipStream = new MemoryStream();
             using var zip = ZipArchive.Create();
-            zip.AddEntry("skin.ini", generateSkinIni(name, author));
+            zip.AddEntry("skin.ini", generateSkinIni(name, author, makeUnique));
             zip.SaveTo(zipStream);
             return zipStream;
         }
 
-        private MemoryStream generateSkinIni(string name, string author)
+        private MemoryStream generateSkinIni(string name, string author, bool makeUnique = true)
         {
             var stream = new MemoryStream();
             var writer = new StreamWriter(stream);
@@ -155,8 +177,12 @@ namespace osu.Game.Tests.Skins.IO
             writer.WriteLine("[General]");
             writer.WriteLine($"Name: {name}");
             writer.WriteLine($"Author: {author}");
-            writer.WriteLine();
-            writer.WriteLine($"# unique {Guid.NewGuid()}");
+
+            if (makeUnique)
+            {
+                writer.WriteLine();
+                writer.WriteLine($"# unique {Guid.NewGuid()}");
+            }
 
             writer.Flush();
 

From a2484692b3a29cc71c383e3f8b43f250d43c6393 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 23 Aug 2021 20:37:19 +0900
Subject: [PATCH 21/32] Change brackets to square

---
 osu.Game.Tests/Skins/IO/ImportSkinTest.cs | 4 ++++
 osu.Game/Skinning/SkinManager.cs          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
index 0329ca11e2..7a9fc20426 100644
--- a/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
+++ b/osu.Game.Tests/Skins/IO/ImportSkinTest.cs
@@ -148,8 +148,12 @@ namespace osu.Game.Tests.Skins.IO
                     var osu = LoadOsuIntoHost(host);
 
                     var imported = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("name 1", "author 1", false), "my custom skin 1"));
+                    Assert.That(imported.Name, Is.EqualTo("name 1 [my custom skin 1]"));
+                    Assert.That(imported.Creator, Is.EqualTo("author 1"));
 
                     var imported2 = await loadSkinIntoOsu(osu, new ZipArchiveReader(createOsk("name 1", "author 1", false), "my custom skin 2"));
+                    Assert.That(imported2.Name, Is.EqualTo("name 1 [my custom skin 2]"));
+                    Assert.That(imported2.Creator, Is.EqualTo("author 1"));
 
                     Assert.That(imported2.Hash, Is.Not.EqualTo(imported.Hash));
                 }
diff --git a/osu.Game/Skinning/SkinManager.cs b/osu.Game/Skinning/SkinManager.cs
index 0aa1c62d04..edeb17cbad 100644
--- a/osu.Game/Skinning/SkinManager.cs
+++ b/osu.Game/Skinning/SkinManager.cs
@@ -181,7 +181,7 @@ namespace osu.Game.Skinning
             bool isArchiveImport = archiveName?.Contains(".osk", StringComparison.OrdinalIgnoreCase) == true;
 
             if (archiveName != null && !isArchiveImport && archiveName != item.Name)
-                item.Name = $"{item.Name} ({archiveName})";
+                item.Name = $"{item.Name} [{archiveName}]";
         }
 
         /// <summary>

From 6e3d05c7ce5c42cd932ddab403c6f1654caffe2d Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Tue, 24 Aug 2021 09:42:53 +0800
Subject: [PATCH 22/32] Display an icon to signify incompatibility instead of a
 red tint

---
 osu.Game/Overlays/Mods/ModButton.cs | 43 +++++++++++++++++------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 359d1a7981..f4233c65cb 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -33,6 +33,7 @@ namespace osu.Game.Overlays.Mods
         private ModIcon backgroundIcon;
         private readonly SpriteText text;
         private readonly Container<ModIcon> iconsContainer;
+        private readonly SpriteIcon incompatibleIcon;
 
         /// <summary>
         /// Fired when the selection changes.
@@ -243,28 +244,25 @@ namespace osu.Game.Overlays.Mods
                 backgroundIcon.Mod = foregroundIcon.Mod;
             foregroundIcon.Mod = mod;
             text.Text = mod.Name;
-            updateColour(mod);
+            Colour = mod.HasImplementation ? Color4.White : Color4.Gray;
+            updateCompatibility(mod);
         }
 
-        private Colour4 lightRed;
-        private Colour4 darkRed;
-
-        private void updateColour(Mod mod)
+        private void updateCompatibility(Mod mod)
         {
-            var baseColour = mod.HasImplementation ? Color4.White : Color4.Gray;
-
             if (globalSelectedMods != null)
             {
                 if (!globalSelectedMods.Value.Contains(mod))
                 {
                     if (!ModUtils.CheckCompatibleSet(globalSelectedMods.Value.Concat(new[] { mod })))
                     {
-                        baseColour = mod.HasImplementation ? lightRed : darkRed;
+                        incompatibleIcon.FadeIn();
+                        return;
                     }
                 }
             }
 
-            Colour = baseColour;
+            incompatibleIcon.FadeOut();
         }
 
         private void createIcons()
@@ -312,11 +310,24 @@ namespace osu.Game.Overlays.Mods
                     {
                         scaleContainer = new Container
                         {
-                            Child = iconsContainer = new Container<ModIcon>
+                            Children = new Drawable[]
                             {
-                                RelativeSizeAxes = Axes.Both,
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
+                                iconsContainer = new Container<ModIcon>
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Origin = Anchor.Centre,
+                                    Anchor = Anchor.Centre,
+                                },
+                                incompatibleIcon = new SpriteIcon
+                                {
+                                    Origin = Anchor.BottomRight,
+                                    Anchor = Anchor.BottomRight,
+                                    Icon = FontAwesome.Solid.Ban,
+                                    Colour = Color4.Red,
+                                    Size = new Vector2(30),
+                                    Shadow = true,
+                                    Alpha = 0
+                                }
                             },
                             RelativeSizeAxes = Axes.Both,
                             Origin = Anchor.Centre,
@@ -338,11 +349,9 @@ namespace osu.Game.Overlays.Mods
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuColour colour)
+        private void load()
         {
-            lightRed = colour.RedLight;
-            darkRed = colour.RedDark;
-            globalSelectedMods.BindValueChanged(_ => updateColour(SelectedMod ?? Mods.FirstOrDefault()), true);
+            globalSelectedMods.BindValueChanged(_ => updateCompatibility(SelectedMod ?? Mods.FirstOrDefault()), true);
         }
 
         public ITooltip GetCustomTooltip() => new ModButtonTooltip();

From b8fe03b77f8912bf1f6cf9b65548194a54e4ad0b Mon Sep 17 00:00:00 2001
From: Henry Lin <henry.ys.lin@gmail.com>
Date: Tue, 24 Aug 2021 09:50:09 +0800
Subject: [PATCH 23/32] Use `Mod.Equals` for comparison

---
 osu.Game/Overlays/Mods/ModButtonTooltip.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButtonTooltip.cs b/osu.Game/Overlays/Mods/ModButtonTooltip.cs
index 1b889281f0..666ed07e28 100644
--- a/osu.Game/Overlays/Mods/ModButtonTooltip.cs
+++ b/osu.Game/Overlays/Mods/ModButtonTooltip.cs
@@ -80,16 +80,16 @@ namespace osu.Game.Overlays.Mods
         protected override void PopIn() => this.FadeIn(200, Easing.OutQuint);
         protected override void PopOut() => this.FadeOut(200, Easing.OutQuint);
 
-        private string lastMod;
+        private Mod lastMod;
 
         public bool SetContent(object content)
         {
             if (!(content is Mod mod))
                 return false;
 
-            if (mod.Acronym == lastMod) return true;
+            if (mod.Equals(lastMod)) return true;
 
-            lastMod = mod.Acronym;
+            lastMod = mod;
 
             descriptionText.Text = mod.Description;
 

From c2974cfc65b1b74697729776dd533a621d84f33b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 24 Aug 2021 13:20:01 +0900
Subject: [PATCH 24/32] Add full multiplayer gameplay flow test

---
 osu.Game.Tests/Resources/TestResources.cs     |  2 ++
 .../Multiplayer/TestSceneMultiplayer.cs       | 36 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index cef0532f9d..7170a76b8b 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -9,6 +9,8 @@ namespace osu.Game.Tests.Resources
 {
     public static class TestResources
     {
+        public const double QUICK_BEATMAP_LENGTH = 10000;
+
         public static DllResourceStore GetStore() => new DllResourceStore(typeof(TestResources).Assembly);
 
         public static Stream OpenResource(string name) => GetStore().GetStream($"Resources/{name}");
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 6c1aed71e6..7a3507d944 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -28,6 +28,8 @@ using osu.Game.Screens.OnlinePlay.Lounge.Components;
 using osu.Game.Screens.OnlinePlay.Match;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Screens.OnlinePlay.Multiplayer.Match;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Ranking;
 using osu.Game.Tests.Resources;
 using osu.Game.Users;
 using osuTK.Input;
@@ -430,6 +432,40 @@ namespace osu.Game.Tests.Visual.Multiplayer
             }
         }
 
+        [Test]
+        public void TestGameplayFlow()
+        {
+            createRoom(() => new Room
+            {
+                Name = { Value = "Test Room" },
+                Playlist =
+                {
+                    new PlaylistItem
+                    {
+                        Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.RulesetID == 0)).BeatmapInfo },
+                        Ruleset = { Value = new OsuRuleset().RulesetInfo },
+                    }
+                }
+            });
+
+            AddRepeatStep("click spectate button", () =>
+            {
+                InputManager.MoveMouseTo(this.ChildrenOfType<MultiplayerReadyButton>().Single());
+                InputManager.Click(MouseButton.Left);
+            }, 2);
+
+            AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
+
+            // Gameplay runs in real-time, so we need to incrementally check if gameplay has finished in order to not time out.
+            for (double i = 1000; i < TestResources.QUICK_BEATMAP_LENGTH; i += 1000)
+            {
+                var time = i;
+                AddUntilStep($"wait for time > {i}", () => this.ChildrenOfType<GameplayClockContainer>().SingleOrDefault()?.GameplayClock.CurrentTime > time);
+            }
+
+            AddUntilStep("wait for results", () => Stack.CurrentScreen is ResultsScreen);
+        }
+
         private void createRoom(Func<Room> room)
         {
             AddUntilStep("wait for lounge", () => multiplayerScreen.ChildrenOfType<LoungeSubScreen>().SingleOrDefault()?.IsLoaded == true);

From df170afbc433b3ea8faeb9afe2ec5ac35f16e34a Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 24 Aug 2021 13:22:06 +0900
Subject: [PATCH 25/32] Fix multiplayer crashing when entering gameplay

---
 .../Multiplayer/TestSceneGameplayChatDisplay.cs      |  2 +-
 .../Visual/Multiplayer/TestSceneMultiplayerPlayer.cs |  2 +-
 .../OnlinePlay/Match/Components/MatchChatDisplay.cs  | 12 ++++++------
 .../OnlinePlay/Multiplayer/GameplayChatDisplay.cs    |  5 +++--
 .../Multiplayer/MultiplayerMatchSubScreen.cs         |  4 ++--
 .../OnlinePlay/Multiplayer/MultiplayerPlayer.cs      |  7 ++++---
 .../Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs  |  4 ++--
 .../OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs   |  4 ++--
 osu.Game/Screens/Play/RoomSubmittingPlayer.cs        | 10 ++++++----
 9 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
index eadfc9b279..a3a1cacb0d 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneGameplayChatDisplay.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
         {
             base.SetUpSteps();
 
-            AddStep("load chat display", () => Child = chatDisplay = new GameplayChatDisplay
+            AddStep("load chat display", () => Child = chatDisplay = new GameplayChatDisplay(SelectedRoom.Value)
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
index 80da7a7e5e..a1543f99e1 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPlayer.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
             AddStep("initialise gameplay", () =>
             {
-                Stack.Push(player = new MultiplayerPlayer(Client.CurrentMatchPlayingItem.Value, Client.Room?.Users.ToArray()));
+                Stack.Push(player = new MultiplayerPlayer(Client.APIRoom, Client.CurrentMatchPlayingItem.Value, Client.Room?.Users.ToArray()));
             });
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
index 5f960c1b5c..05a3546cec 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
@@ -10,21 +10,21 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class MatchChatDisplay : StandAloneChatDisplay
     {
-        [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<long?> roomId { get; set; }
-
-        [Resolved(typeof(Room), nameof(Room.ChannelId))]
-        private Bindable<int> channelId { get; set; }
+        private readonly IBindable<long?> roomId = new Bindable<long?>();
+        private readonly IBindable<int> channelId = new Bindable<int>();
 
         [Resolved(CanBeNull = true)]
         private ChannelManager channelManager { get; set; }
 
         private readonly bool leaveChannelOnDispose;
 
-        public MatchChatDisplay(bool leaveChannelOnDispose = true)
+        public MatchChatDisplay(Room room, bool leaveChannelOnDispose = true)
             : base(true)
         {
             this.leaveChannelOnDispose = leaveChannelOnDispose;
+
+            roomId.BindTo(room.RoomID);
+            channelId.BindTo(room.ChannelId);
         }
 
         protected override void LoadComplete()
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayChatDisplay.cs
index 9fe41842f3..3af72fa25a 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/GameplayChatDisplay.cs
@@ -7,6 +7,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Input.Bindings;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Match.Components;
 using osu.Game.Screens.Play;
 
@@ -29,8 +30,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         public override bool PropagateNonPositionalInputSubTree => true;
 
-        public GameplayChatDisplay()
-            : base(leaveChannelOnDispose: false)
+        public GameplayChatDisplay(Room room)
+            : base(room, leaveChannelOnDispose: false)
         {
             RelativeSizeAxes = Axes.X;
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
index 06e60903aa..fb18e7a31f 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
@@ -173,7 +173,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                                                 },
                                             },
                                             new Drawable[] { new OverlinedHeader("Chat") { Margin = new MarginPadding { Vertical = 5 }, }, },
-                                            new Drawable[] { new MatchChatDisplay { RelativeSizeAxes = Axes.Both } }
+                                            new Drawable[] { new MatchChatDisplay(Room) { RelativeSizeAxes = Axes.Both } }
                                         },
                                         RowDimensions = new[]
                                         {
@@ -395,7 +395,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                     return new MultiSpectatorScreen(users.Take(PlayerGrid.MAX_PLAYERS).ToArray());
 
                 default:
-                    return new PlayerLoader(() => new MultiplayerPlayer(SelectedItem.Value, users));
+                    return new PlayerLoader(() => new MultiplayerPlayer(Room, SelectedItem.Value, users));
             }
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 24657943d7..4c26feb067 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -45,10 +45,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
         /// <summary>
         /// Construct a multiplayer player.
         /// </summary>
+        /// <param name="room">The room.</param>
         /// <param name="playlistItem">The playlist item to be played.</param>
         /// <param name="users">The users which are participating in this game.</param>
-        public MultiplayerPlayer(PlaylistItem playlistItem, MultiplayerRoomUser[] users)
-            : base(playlistItem, new PlayerConfiguration
+        public MultiplayerPlayer(Room room, PlaylistItem playlistItem, MultiplayerRoomUser[] users)
+            : base(room, playlistItem, new PlayerConfiguration
             {
                 AllowPause = false,
                 AllowRestart = false,
@@ -92,7 +93,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
                 }
             });
 
-            LoadComponentAsync(new GameplayChatDisplay
+            LoadComponentAsync(new GameplayChatDisplay(Room)
             {
                 Expanded = { BindTarget = HUDOverlay.ShowHud },
             }, chat => leaderboardFlow.Insert(2, chat));
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index 567ea6b988..c441728bb6 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -20,8 +20,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
     {
         public Action Exited;
 
-        public PlaylistsPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
-            : base(playlistItem, configuration)
+        public PlaylistsPlayer(Room room, PlaylistItem playlistItem, PlayerConfiguration configuration = null)
+            : base(room, playlistItem, configuration)
         {
         }
 
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
index 98fed3b467..a9ce9c52c4 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
                             },
                             new Drawable[] { leaderboard = new MatchLeaderboard { RelativeSizeAxes = Axes.Both }, },
                             new Drawable[] { new OverlinedHeader("Chat"), },
-                            new Drawable[] { new MatchChatDisplay { RelativeSizeAxes = Axes.Both } }
+                            new Drawable[] { new MatchChatDisplay(Room) { RelativeSizeAxes = Axes.Both } }
                         },
                         RowDimensions = new[]
                         {
@@ -199,7 +199,7 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
             Logger.Log($"Polling adjusted (selection: {selectionPollingComponent.TimeBetweenPolls.Value})");
         }
 
-        protected override Screen CreateGameplayScreen() => new PlayerLoader(() => new PlaylistsPlayer(SelectedItem.Value)
+        protected override Screen CreateGameplayScreen() => new PlayerLoader(() => new PlaylistsPlayer(Room, SelectedItem.Value)
         {
             Exited = () => leaderboard.RefreshScores()
         });
diff --git a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
index 7ba12f5db6..593b67a7b0 100644
--- a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
@@ -1,7 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
@@ -14,15 +13,18 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public abstract class RoomSubmittingPlayer : SubmittingPlayer
     {
-        [Resolved(typeof(Room), nameof(Room.RoomID))]
-        protected Bindable<long?> RoomId { get; private set; }
+        protected readonly IBindable<long?> RoomId = new Bindable<long?>();
 
         protected readonly PlaylistItem PlaylistItem;
+        protected readonly Room Room;
 
-        protected RoomSubmittingPlayer(PlaylistItem playlistItem, PlayerConfiguration configuration = null)
+        protected RoomSubmittingPlayer(Room room, PlaylistItem playlistItem, PlayerConfiguration configuration = null)
             : base(configuration)
         {
+            Room = room;
             PlaylistItem = playlistItem;
+
+            RoomId.BindTo(room.RoomID);
         }
 
         protected override APIRequest<APIScoreToken> CreateTokenRequest()

From bf0a1167ec990f64f3f98993f018d2eb758b8395 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Aug 2021 13:35:39 +0900
Subject: [PATCH 26/32] Improve update flow and ensure selected mods is read
 from local context

---
 osu.Game/Overlays/Mods/ModButton.cs        | 35 ++++++++++------------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs |  1 +
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index f4233c65cb..247c78152d 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -49,7 +49,7 @@ namespace osu.Game.Overlays.Mods
         private int selectedIndex = -1;
 
         [Resolved]
-        private Bindable<IReadOnlyList<Mod>> globalSelectedMods { get; set; }
+        private Bindable<IReadOnlyList<Mod>> selectedMods { get; set; }
 
         /// <summary>
         /// Change the selected mod index of this button.
@@ -245,24 +245,20 @@ namespace osu.Game.Overlays.Mods
             foregroundIcon.Mod = mod;
             text.Text = mod.Name;
             Colour = mod.HasImplementation ? Color4.White : Color4.Gray;
-            updateCompatibility(mod);
+
+            Scheduler.AddOnce(updateCompatibility);
         }
 
-        private void updateCompatibility(Mod mod)
+        private void updateCompatibility()
         {
-            if (globalSelectedMods != null)
-            {
-                if (!globalSelectedMods.Value.Contains(mod))
-                {
-                    if (!ModUtils.CheckCompatibleSet(globalSelectedMods.Value.Concat(new[] { mod })))
-                    {
-                        incompatibleIcon.FadeIn();
-                        return;
-                    }
-                }
-            }
+            var m = SelectedMod ?? Mods.First();
 
-            incompatibleIcon.FadeOut();
+            bool isIncompatible = false;
+
+            if (selectedMods.Value.Count > 0 && !selectedMods.Value.Contains(m))
+                isIncompatible = !ModUtils.CheckCompatibleSet(selectedMods.Value.Append(m));
+
+            incompatibleIcon.FadeTo(isIncompatible ? 1 : 0, 200, Easing.OutQuint);
         }
 
         private void createIcons()
@@ -287,6 +283,7 @@ namespace osu.Game.Overlays.Mods
                     },
                 });
             }
+
             else
             {
                 iconsContainer.Add(foregroundIcon = new ModIcon(Mod, false)
@@ -344,14 +341,14 @@ namespace osu.Game.Overlays.Mods
                 },
                 new HoverSounds()
             };
-
             Mod = mod;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
+        protected override void LoadComplete()
         {
-            globalSelectedMods.BindValueChanged(_ => updateCompatibility(SelectedMod ?? Mods.FirstOrDefault()), true);
+            base.LoadComplete();
+
+            selectedMods.BindValueChanged(_ => Scheduler.AddOnce(updateCompatibility), true);
         }
 
         public ITooltip GetCustomTooltip() => new ModButtonTooltip();
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index 96eba7808f..fdef48d556 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -74,6 +74,7 @@ namespace osu.Game.Overlays.Mods
 
         protected readonly ModSettingsContainer ModSettingsContainer;
 
+        [Cached]
         public readonly Bindable<IReadOnlyList<Mod>> SelectedMods = new Bindable<IReadOnlyList<Mod>>(Array.Empty<Mod>());
 
         private Bindable<Dictionary<ModType, IReadOnlyList<Mod>>> availableMods;

From 847726547ad9f203c665312ec9ca2d4d027a6be8 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Tue, 24 Aug 2021 07:53:49 +0300
Subject: [PATCH 27/32] Move mod value change callback inside wedge info text
 component

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs | 26 +++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index d40e21cd5e..ac191a38f2 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -44,9 +44,6 @@ namespace osu.Game.Screens.Select
         [Resolved]
         private IBindable<RulesetInfo> ruleset { get; set; }
 
-        [Resolved]
-        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
-
         protected Container DisplayedContent { get; private set; }
 
         protected WedgeInfoText Info { get; private set; }
@@ -71,7 +68,6 @@ namespace osu.Game.Screens.Select
         private void load()
         {
             ruleset.BindValueChanged(_ => updateDisplay());
-            mods.BindValueChanged(_ => updateDisplay());
         }
 
         private const double animation_duration = 800;
@@ -138,7 +134,7 @@ namespace osu.Game.Screens.Select
                     Children = new Drawable[]
                     {
                         new BeatmapInfoWedgeBackground(beatmap),
-                        Info = new WedgeInfoText(beatmap, ruleset.Value, mods.Value),
+                        Info = new WedgeInfoText(beatmap, ruleset.Value),
                     }
                 }, loaded =>
                 {
@@ -169,15 +165,16 @@ namespace osu.Game.Screens.Select
 
             private readonly WorkingBeatmap beatmap;
             private readonly RulesetInfo ruleset;
-            private readonly IReadOnlyList<Mod> mods;
+
+            [Resolved]
+            private IBindable<IReadOnlyList<Mod>> mods { get; set; }
 
             private ModSettingChangeTracker settingChangeTracker;
 
-            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset, IReadOnlyList<Mod> mods)
+            public WedgeInfoText(WorkingBeatmap beatmap, RulesetInfo userRuleset)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
-                this.mods = mods;
             }
 
             private CancellationTokenSource cancellationSource;
@@ -363,10 +360,15 @@ namespace osu.Game.Screens.Select
                     }
                 };
 
-                settingChangeTracker = new ModSettingChangeTracker(mods);
-                settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
+                mods.BindValueChanged(m =>
+                {
+                    settingChangeTracker?.Dispose();
 
-                refreshBPMLabel();
+                    refreshBPMLabel();
+
+                    settingChangeTracker = new ModSettingChangeTracker(m.NewValue);
+                    settingChangeTracker.SettingChanged += _ => refreshBPMLabel();
+                }, true);
             }
 
             private InfoLabel[] getRulesetInfoLabels()
@@ -404,7 +406,7 @@ namespace osu.Game.Screens.Select
 
                 // this doesn't consider mods which apply variable rates, yet.
                 double rate = 1;
-                foreach (var mod in mods.OfType<IApplicableToRate>())
+                foreach (var mod in mods.Value.OfType<IApplicableToRate>())
                     rate = mod.ApplyToRate(0, rate);
 
                 double bpmMax = b.ControlPointInfo.BPMMaximum * rate;

From afd01d22d6c29b9bbf1ba6bc0efe344269f1ad64 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Aug 2021 13:58:31 +0900
Subject: [PATCH 28/32] Adjust visuals of incompatible icon and move to own
 class

---
 osu.Game/Overlays/Mods/IncompatibleIcon.cs | 64 ++++++++++++++++++++++
 osu.Game/Overlays/Mods/ModButton.cs        | 17 +++---
 2 files changed, 72 insertions(+), 9 deletions(-)
 create mode 100644 osu.Game/Overlays/Mods/IncompatibleIcon.cs

diff --git a/osu.Game/Overlays/Mods/IncompatibleIcon.cs b/osu.Game/Overlays/Mods/IncompatibleIcon.cs
new file mode 100644
index 0000000000..df134fe4a4
--- /dev/null
+++ b/osu.Game/Overlays/Mods/IncompatibleIcon.cs
@@ -0,0 +1,64 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
+using osu.Framework.Localisation;
+using osu.Game.Graphics;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Overlays.Mods
+{
+    public class IncompatibleIcon : VisibilityContainer, IHasTooltip
+    {
+        private Circle circle;
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            Size = new Vector2(20);
+
+            State.Value = Visibility.Hidden;
+            Alpha = 0;
+
+            InternalChildren = new Drawable[]
+            {
+                circle = new Circle
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Colour = colours.Gray4,
+                },
+                new SpriteIcon
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    Size = new Vector2(0.6f),
+                    Icon = FontAwesome.Solid.Slash,
+                    Colour = Color4.White,
+                    Shadow = true,
+                }
+            };
+        }
+
+        protected override void PopIn()
+        {
+            this.FadeIn(200, Easing.OutQuint);
+            circle.FlashColour(Color4.Red, 500, Easing.OutQuint);
+            this.ScaleTo(1.8f).Then().ScaleTo(1, 500, Easing.OutQuint);
+        }
+
+        protected override void PopOut()
+        {
+            this.FadeOut(200, Easing.OutQuint);
+            this.ScaleTo(0.8f, 200, Easing.In);
+        }
+
+        public LocalisableString TooltipText => "Incompatible with current selected mods";
+    }
+}
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 247c78152d..76046f2467 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Overlays.Mods
         private ModIcon backgroundIcon;
         private readonly SpriteText text;
         private readonly Container<ModIcon> iconsContainer;
-        private readonly SpriteIcon incompatibleIcon;
+        private readonly CompositeDrawable incompatibleIcon;
 
         /// <summary>
         /// Fired when the selection changes.
@@ -258,7 +258,10 @@ namespace osu.Game.Overlays.Mods
             if (selectedMods.Value.Count > 0 && !selectedMods.Value.Contains(m))
                 isIncompatible = !ModUtils.CheckCompatibleSet(selectedMods.Value.Append(m));
 
-            incompatibleIcon.FadeTo(isIncompatible ? 1 : 0, 200, Easing.OutQuint);
+            if (isIncompatible)
+                incompatibleIcon.Show();
+            else
+                incompatibleIcon.Hide();
         }
 
         private void createIcons()
@@ -315,15 +318,11 @@ namespace osu.Game.Overlays.Mods
                                     Origin = Anchor.Centre,
                                     Anchor = Anchor.Centre,
                                 },
-                                incompatibleIcon = new SpriteIcon
+                                incompatibleIcon = new IncompatibleIcon
                                 {
-                                    Origin = Anchor.BottomRight,
+                                    Origin = Anchor.Centre,
                                     Anchor = Anchor.BottomRight,
-                                    Icon = FontAwesome.Solid.Ban,
-                                    Colour = Color4.Red,
-                                    Size = new Vector2(30),
-                                    Shadow = true,
-                                    Alpha = 0
+                                    Position = new Vector2(-13),
                                 }
                             },
                             RelativeSizeAxes = Axes.Both,

From c3b7ce0b059bd90529bf00eb8eadd1db256d1c9c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Aug 2021 14:02:50 +0900
Subject: [PATCH 29/32] Remove stray newline

---
 osu.Game/Overlays/Mods/ModButton.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 76046f2467..4675eb6bc8 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -286,7 +286,6 @@ namespace osu.Game.Overlays.Mods
                     },
                 });
             }
-
             else
             {
                 iconsContainer.Add(foregroundIcon = new ModIcon(Mod, false)

From 16ddbcd208db9f94765e47e9975c6fa10acb7f3b Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Tue, 24 Aug 2021 14:25:29 +0900
Subject: [PATCH 30/32] Don't bind to RoomId where it's expected to be constant

---
 .../Match/Components/MatchChatDisplay.cs           | 12 ++++++------
 .../OnlinePlay/Multiplayer/MultiplayerPlayer.cs    |  7 ++++---
 .../OnlinePlay/Playlists/PlaylistsPlayer.cs        |  4 ++--
 osu.Game/Screens/Play/RoomSubmittingPlayer.cs      | 14 +++++++-------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
index 05a3546cec..0396562959 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
@@ -10,36 +10,36 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 {
     public class MatchChatDisplay : StandAloneChatDisplay
     {
-        private readonly IBindable<long?> roomId = new Bindable<long?>();
         private readonly IBindable<int> channelId = new Bindable<int>();
 
         [Resolved(CanBeNull = true)]
         private ChannelManager channelManager { get; set; }
 
+        private readonly Room room;
         private readonly bool leaveChannelOnDispose;
 
         public MatchChatDisplay(Room room, bool leaveChannelOnDispose = true)
             : base(true)
         {
+            this.room = room;
             this.leaveChannelOnDispose = leaveChannelOnDispose;
-
-            roomId.BindTo(room.RoomID);
-            channelId.BindTo(room.ChannelId);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
 
+            // Required for the time being since this component is created prior to the room being joined.
+            channelId.BindTo(room.ChannelId);
             channelId.BindValueChanged(_ => updateChannel(), true);
         }
 
         private void updateChannel()
         {
-            if (roomId.Value == null || channelId.Value == 0)
+            if (room.RoomID.Value == null || channelId.Value == 0)
                 return;
 
-            Channel.Value = channelManager?.JoinChannel(new Channel { Id = channelId.Value, Type = ChannelType.Multiplayer, Name = $"#lazermp_{roomId.Value}" });
+            Channel.Value = channelManager?.JoinChannel(new Channel { Id = channelId.Value, Type = ChannelType.Multiplayer, Name = $"#lazermp_{room.RoomID.Value}" });
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
index 4c26feb067..89acda27c3 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
@@ -187,10 +187,11 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         protected override ResultsScreen CreateResults(ScoreInfo score)
         {
-            Debug.Assert(RoomId.Value != null);
+            Debug.Assert(Room.RoomID.Value != null);
+
             return leaderboard.TeamScores.Count == 2
-                ? new MultiplayerTeamResultsScreen(score, RoomId.Value.Value, PlaylistItem, leaderboard.TeamScores)
-                : new MultiplayerResultsScreen(score, RoomId.Value.Value, PlaylistItem);
+                ? new MultiplayerTeamResultsScreen(score, Room.RoomID.Value.Value, PlaylistItem, leaderboard.TeamScores)
+                : new MultiplayerResultsScreen(score, Room.RoomID.Value.Value, PlaylistItem);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
index c441728bb6..c76bad7828 100644
--- a/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
@@ -51,8 +51,8 @@ namespace osu.Game.Screens.OnlinePlay.Playlists
 
         protected override ResultsScreen CreateResults(ScoreInfo score)
         {
-            Debug.Assert(RoomId.Value != null);
-            return new PlaylistsResultsScreen(score, RoomId.Value.Value, PlaylistItem, true);
+            Debug.Assert(Room.RoomID.Value != null);
+            return new PlaylistsResultsScreen(score, Room.RoomID.Value.Value, PlaylistItem, true);
         }
 
         protected override async Task PrepareScoreForResultsAsync(Score score)
diff --git a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
index 593b67a7b0..1002e7607f 100644
--- a/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
+++ b/osu.Game/Screens/Play/RoomSubmittingPlayer.cs
@@ -1,7 +1,7 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using osu.Framework.Bindables;
+using System.Diagnostics;
 using osu.Game.Online.API;
 using osu.Game.Online.Rooms;
 using osu.Game.Scoring;
@@ -13,8 +13,6 @@ namespace osu.Game.Screens.Play
     /// </summary>
     public abstract class RoomSubmittingPlayer : SubmittingPlayer
     {
-        protected readonly IBindable<long?> RoomId = new Bindable<long?>();
-
         protected readonly PlaylistItem PlaylistItem;
         protected readonly Room Room;
 
@@ -23,18 +21,20 @@ namespace osu.Game.Screens.Play
         {
             Room = room;
             PlaylistItem = playlistItem;
-
-            RoomId.BindTo(room.RoomID);
         }
 
         protected override APIRequest<APIScoreToken> CreateTokenRequest()
         {
-            if (!(RoomId.Value is long roomId))
+            if (!(Room.RoomID.Value is long roomId))
                 return null;
 
             return new CreateRoomScoreRequest(roomId, PlaylistItem.ID, Game.VersionHash);
         }
 
-        protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token) => new SubmitRoomScoreRequest(token, RoomId.Value ?? 0, PlaylistItem.ID, score.ScoreInfo);
+        protected override APIRequest<MultiplayerScore> CreateSubmissionRequest(Score score, long token)
+        {
+            Debug.Assert(Room.RoomID.Value != null);
+            return new SubmitRoomScoreRequest(token, Room.RoomID.Value.Value, PlaylistItem.ID, score.ScoreInfo);
+        }
     }
 }

From 4bbc98737f7a0cba8846f79b909ee2befd338cb6 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Aug 2021 14:39:03 +0900
Subject: [PATCH 31/32] Fix english in test steps

---
 osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 4809a737d9..31e5a9b86c 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Online
 
             setUpCommentsResponse(comments);
             AddStep("show comments", () => commentsContainer.ShowComments(CommentableType.Beatmapset, 123));
-            AddAssert("no comment showed", () => !commentsContainer.ChildrenOfType<DrawableComment>().Any());
+            AddAssert("no comment shown", () => !commentsContainer.ChildrenOfType<DrawableComment>().Any());
         }
 
         [TestCase(false)]
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Online
             setUpCommentsResponse(bundle);
             AddStep("show comments", () => commentsContainer.ShowComments(CommentableType.Beatmapset, 123));
             AddUntilStep("wait comment load", () => commentsContainer.ChildrenOfType<DrawableComment>().Any());
-            AddAssert("only one comment showed", () =>
+            AddAssert("only one comment shown", () =>
                 commentsContainer.ChildrenOfType<DrawableComment>().Count(d => d.Comment.Pinned == withPinned) == 1);
         }
 

From a5f6c287eaeec370c785bf9b4afbf31734d9cceb Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 24 Aug 2021 14:43:28 +0900
Subject: [PATCH 32/32] Split out pinned comment content to only be constructed
 when required

---
 osu.Game/Overlays/Comments/DrawableComment.cs | 56 ++++++++++---------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index d80d566f3a..a44f3a7643 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -138,36 +138,13 @@ namespace osu.Game.Overlays.Comments
                                                     AutoSizeAxes = Axes.Both,
                                                     Direction = FillDirection.Horizontal,
                                                     Spacing = new Vector2(10, 0),
-                                                    Children = new Drawable[]
+                                                    Children = new[]
                                                     {
                                                         username = new LinkFlowContainer(s => s.Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold))
                                                         {
                                                             AutoSizeAxes = Axes.Both
                                                         },
-                                                        new FillFlowContainer
-                                                        {
-                                                            AutoSizeAxes = Axes.Both,
-                                                            Direction = FillDirection.Horizontal,
-                                                            Spacing = new Vector2(2, 0),
-                                                            Alpha = Comment.Pinned ? 1 : 0,
-                                                            Children = new Drawable[]
-                                                            {
-                                                                new SpriteIcon
-                                                                {
-                                                                    Icon = FontAwesome.Solid.Thumbtack,
-                                                                    Size = new Vector2(14),
-                                                                    Anchor = Anchor.CentreLeft,
-                                                                    Origin = Anchor.CentreLeft,
-                                                                },
-                                                                new OsuSpriteText
-                                                                {
-                                                                    Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
-                                                                    Text = CommentsStrings.Pinned,
-                                                                    Anchor = Anchor.CentreLeft,
-                                                                    Origin = Anchor.CentreLeft,
-                                                                }
-                                                            },
-                                                        },
+                                                        Comment.Pinned ? new PinnedCommentNotice() : Empty(),
                                                         new ParentUsername(Comment),
                                                         new OsuSpriteText
                                                         {
@@ -346,9 +323,7 @@ namespace osu.Game.Overlays.Comments
                     this.FadeTo(show.NewValue ? 1 : 0);
             }, true);
             childrenExpanded.BindValueChanged(expanded => childCommentsVisibilityContainer.FadeTo(expanded.NewValue ? 1 : 0), true);
-
             updateButtonsState();
-
             base.LoadComplete();
         }
 
@@ -417,6 +392,33 @@ namespace osu.Game.Overlays.Comments
             };
         }
 
+        private class PinnedCommentNotice : FillFlowContainer
+        {
+            public PinnedCommentNotice()
+            {
+                AutoSizeAxes = Axes.Both;
+                Direction = FillDirection.Horizontal;
+                Spacing = new Vector2(2, 0);
+                Children = new Drawable[]
+                {
+                    new SpriteIcon
+                    {
+                        Icon = FontAwesome.Solid.Thumbtack,
+                        Size = new Vector2(14),
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                    },
+                    new OsuSpriteText
+                    {
+                        Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold),
+                        Text = CommentsStrings.Pinned,
+                        Anchor = Anchor.CentreLeft,
+                        Origin = Anchor.CentreLeft,
+                    }
+                };
+            }
+        }
+
         private class ParentUsername : FillFlowContainer, IHasTooltip
         {
             public LocalisableString TooltipText => getParentMessage();