h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 14:12:55 +08:00
Code Issues Releases Wiki Activity

Use new algorithm for comments tree creation

Browse Source
This commit is contained in:
Andrei Zavatski 2020-02-13 02:21:13 +03:00
parent e2b3494352
commit 5201c1c87b
3 changed files with 55 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Online/API/Requests/Responses/Comment.cs
View File

@ -4,6 +4,7 @@
using Newtonsoft.Json;
using osu.Game.Users;
using System;
using System.Collections.Generic;
namespace osu.Game.Online.API.Requests.Responses
{
@ -15,6 +16,8 @@ namespace osu.Game.Online.API.Requests.Responses
[JsonProperty(@"parent_id")]
public long? ParentId { get; set; }
public readonly List<Comment> ChildComments = new List<Comment>();
public Comment ParentComment { get; set; }
[JsonProperty(@"user_id")]

63
osu.Game/Overlays/Comments/CommentsPage.cs
View File

@ -12,7 +12,6 @@ using System.Linq;
using osu.Game.Online.API.Requests;
using osu.Game.Online.API;
using System.Collections.Generic;
using osu.Framework.Extensions.IEnumerableExtensions;
namespace osu.Game.Overlays.Comments
{
@ -27,6 +26,7 @@ namespace osu.Game.Overlays.Comments
private IAPIProvider api { get; set; }
private readonly CommentBundle commentBundle;
private FillFlowContainer flow;
public CommentsPage(CommentBundle commentBundle)
{
@ -36,8 +36,6 @@ namespace osu.Game.Overlays.Comments
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
{
FillFlowContainer flow;
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
@ -62,24 +60,59 @@ namespace osu.Game.Overlays.Comments
return;
}
commentBundle.Comments.ForEach(c =>
{
if (c.IsTopLevel)
flow.Add(createCommentWithReplies(c, commentBundle));
});
createBaseTree(commentBundle.Comments);
}
private DrawableComment createCommentWithReplies(Comment comment, CommentBundle commentBundle)
private void createBaseTree(List<Comment> comments)
{
var nodeDictionary = new Dictionary<long, Comment>();
var topLevelNodes = new List<Comment>();
var orphanedNodes = new List<Comment>();
foreach (var comment in comments)
{
nodeDictionary.Add(comment.Id, comment);
if (comment.IsTopLevel)
topLevelNodes.Add(comment);
var orphanedNodesCopy = new List<Comment>(orphanedNodes);
foreach (var orphan in orphanedNodesCopy)
{
if (orphan.ParentId == comment.Id)
{
orphan.ParentComment = comment;
comment.ChildComments.Add(orphan);
orphanedNodes.Remove(orphan);
}
}
// No need to find parent for top-level comment
if (comment.IsTopLevel)
continue;
if (nodeDictionary.ContainsKey(comment.ParentId.Value))
{
comment.ParentComment = nodeDictionary[comment.ParentId.Value];
nodeDictionary[comment.ParentId.Value].ChildComments.Add(comment);
}
else
orphanedNodes.Add(comment);
}
foreach (var comment in topLevelNodes)
flow.Add(createCommentWithReplies(comment));
}
private DrawableComment createCommentWithReplies(Comment comment)
{
var drawableComment = createDrawableComment(comment);
var replies = commentBundle.Comments.Where(c => c.ParentId == comment.Id);
var replies = comment.ChildComments;
if (replies.Any())
{
replies.ForEach(c => c.ParentComment = comment);
drawableComment.InitialReplies.AddRange(replies.Select(reply => createCommentWithReplies(reply, commentBundle)));
}
drawableComment.InitialReplies.AddRange(replies.Select(createCommentWithReplies));
return drawableComment;
}
@ -100,7 +133,7 @@ namespace osu.Game.Overlays.Comments
// We may receive already loaded comments
receivedComments.ForEach(c =>
{
if (drawableComment.LoadedReplies.All(loadedReply => loadedReply.Id != c.Id))
if (!drawableComment.LoadedReplies.ContainsKey(c.Id))
uniqueComments.Add(c);
});

7
osu.Game/Overlays/Comments/DrawableComment.cs
View File

@ -20,6 +20,7 @@ using osuTK.Graphics;
using System.Collections.Generic;
using System;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Extensions.IEnumerableExtensions;
namespace osu.Game.Overlays.Comments
{
@ -34,10 +35,10 @@ namespace osu.Game.Overlays.Comments
public readonly BindableBool ShowDeleted = new BindableBool();
public readonly Bindable<CommentsSortCriteria> Sort = new Bindable<CommentsSortCriteria>();
public readonly List<Comment> LoadedReplies = new List<Comment>();
public readonly Dictionary<long, Comment> LoadedReplies = new Dictionary<long, Comment>();
/// <summary>
/// <see cref="DrawableComment"/>s which will be added to this <see cref="DrawableComment"/> as replies when it will be loaded.
/// <see cref="DrawableComment"/>s which will be added to this <see cref="DrawableComment"/> as replies on initial load.
/// </summary>
public readonly List<DrawableComment> InitialReplies = new List<DrawableComment>();
@ -310,7 +311,7 @@ namespace osu.Game.Overlays.Comments
childCommentsContainer.Add(page);
var newReplies = replies.Select(reply => reply.Comment);
LoadedReplies.AddRange(newReplies);
newReplies.ForEach(reply => LoadedReplies.Add(reply.Id, reply));
deletedCommentsCounter.Count.Value += newReplies.Count(reply => reply.IsDeleted);
updateButtonsState();
}