From fe1f2858c19e8e5bf7726abe121b61c8fc9d13ca Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 24 Feb 2020 23:10:37 +0300
Subject: [PATCH] Refactor to avoid duplicated code

---
 osu.Game/Overlays/Comments/CommentsPage.cs | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/osu.Game/Overlays/Comments/CommentsPage.cs b/osu.Game/Overlays/Comments/CommentsPage.cs
index 591400f741..1fb6032924 100644
--- a/osu.Game/Overlays/Comments/CommentsPage.cs
+++ b/osu.Game/Overlays/Comments/CommentsPage.cs
@@ -97,20 +97,12 @@ namespace osu.Game.Overlays.Comments
             var orphaned = new List<Comment>();
 
             // Exclude possible duplicated comments.
-            foreach (var topLevel in bundle.Comments)
+            foreach (var comment in bundle.Comments.Concat(bundle.IncludedComments))
             {
-                if (commentDictionary.ContainsKey(topLevel.Id))
+                if (commentDictionary.ContainsKey(comment.Id))
                     continue;
 
-                addNewComment(topLevel);
-            }
-
-            foreach (var child in bundle.IncludedComments)
-            {
-                if (commentDictionary.ContainsKey(child.Id))
-                    continue;
-
-                addNewComment(child);
+                addNewComment(comment);
             }
 
             // Comments whose parents were seen later than themselves can now be added.