From eb5dad08aa6a8560d544358776c8e6ab3e18e2ea Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Tue, 15 Oct 2019 11:25:58 +0300
Subject: [PATCH] Remove initial filed

---
 .../Online/API/Requests/Responses/Comment.cs  |  2 +-
 .../Overlays/Comments/CommentsContainer.cs    | 36 ++++++++++---------
 osu.Game/Overlays/Comments/DrawableComment.cs |  2 +-
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/Comment.cs b/osu.Game/Online/API/Requests/Responses/Comment.cs
index 9d011c49c1..68a4c28726 100644
--- a/osu.Game/Online/API/Requests/Responses/Comment.cs
+++ b/osu.Game/Online/API/Requests/Responses/Comment.cs
@@ -78,6 +78,6 @@ namespace osu.Game.Online.API.Requests.Responses
             return WebUtility.HtmlDecode(Regex.Replace(MessageHtml, @"<(.|\n)*?>", string.Empty));
         }
 
-        public int GetDeletedChildrenCount => ChildComments.Select(c => c.IsDeleted).Count(c => c);
+        public int DeletedChildrenCount => ChildComments.Count(c => c.IsDeleted);
     }
 }
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 62f0ce947b..824d9822be 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -101,7 +101,7 @@ namespace osu.Game.Overlays.Comments
                                                 Anchor = Anchor.Centre,
                                                 Origin = Anchor.Centre,
                                                 Margin = new MarginPadding(5),
-                                                Action = () => getComments(false),
+                                                Action = getComments
                                             }
                                         }
                                     }
@@ -119,27 +119,31 @@ namespace osu.Game.Overlays.Comments
             base.LoadComplete();
         }
 
-        private void onSortChanged(ValueChangedEvent<CommentsSortCriteria> sort) => getComments();
-
-        private void getComments(bool initial = true)
+        private void onSortChanged(ValueChangedEvent<CommentsSortCriteria> sort)
         {
-            if (initial)
-            {
-                currentPage = 1;
-                loadedTopLevelComments = 0;
-                deletedChildrenPlaceholder.DeletedCount.Value = 0;
-                moreButton.IsLoading = true;
-                content.Clear();
-            }
+            clearComments();
+            getComments();
+        }
 
+        private void getComments()
+        {
             request?.Cancel();
             loadCancellation?.Cancel();
             request = new GetCommentsRequest(type, id, Sort.Value, currentPage++);
-            request.Success += response => onSuccess(response, initial);
+            request.Success += response => onSuccess(response);
             api.Queue(request);
         }
 
-        private void onSuccess(CommentBundle response, bool initial)
+        private void clearComments()
+        {
+            currentPage = 1;
+            loadedTopLevelComments = 0;
+            deletedChildrenPlaceholder.DeletedCount.Value = 0;
+            moreButton.IsLoading = true;
+            content.Clear();
+        }
+
+        private void onSuccess(CommentBundle response)
         {
             loadCancellation = new CancellationTokenSource();
 
@@ -163,9 +167,7 @@ namespace osu.Game.Overlays.Comments
             {
                 content.Add(loaded);
 
-                int deletedComments = response.Comments.Select(c => c.IsDeleted && c.IsTopLevel).Count(c => c);
-
-                deletedChildrenPlaceholder.DeletedCount.Value = initial ? deletedComments : deletedChildrenPlaceholder.DeletedCount.Value + deletedComments;
+                deletedChildrenPlaceholder.DeletedCount.Value += response.Comments.Count(c => c.IsDeleted && c.IsTopLevel);
 
                 if (response.HasMore)
                 {
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 13c67b9f5b..b22bd6d426 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -180,7 +180,7 @@ namespace osu.Game.Overlays.Comments
                 }
             };
 
-            deletedChildrenPlaceholder.DeletedCount.Value = comment.GetDeletedChildrenCount;
+            deletedChildrenPlaceholder.DeletedCount.Value = comment.DeletedChildrenCount;
 
             if (comment.UserId.HasValue)
                 username.AddUserLink(comment.User);