h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 13:22:55 +08:00
Code Issues Releases Wiki Activity

Parse voted comments

Browse Source
This commit is contained in:
Andrei Zavatski 2019-10-17 12:35:12 +03:00
parent a1bb061405
commit 38dcd42d08
3 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,8 @@ namespace osu.Game.Online.API.Requests.Responses
public bool HasMessage => !string.IsNullOrEmpty(MessageHtml); public bool HasMessage => !string.IsNullOrEmpty(MessageHtml);
public bool IsVoted { get; set; }
public string GetMessage => HasMessage ? WebUtility.HtmlDecode(Regex.Replace(MessageHtml, @"<(.|\n)*?>", string.Empty)) : string.Empty; public string GetMessage => HasMessage ? WebUtility.HtmlDecode(Regex.Replace(MessageHtml, @"<(.|\n)*?>", string.Empty)) : string.Empty;
public int DeletedChildrenCount => ChildComments.Count(c => c.IsDeleted); public int DeletedChildrenCount => ChildComments.Count(c => c.IsDeleted);

20
osu.Game/Online/API/Requests/Responses/CommentBundle.cs
View File

@ -47,6 +47,26 @@ namespace osu.Game.Online.API.Requests.Responses
[JsonProperty(@"included_comments")] [JsonProperty(@"included_comments")]
public List<Comment> IncludedComments { get; set; } public List<Comment> IncludedComments { get; set; }
private List<long> userVotes;
[JsonProperty(@"user_votes")]
public List<long> UserVotes
{
get => userVotes;
set
{
userVotes = value;
value.ForEach(v =>
{
Comments.ForEach(c =>
{
if (v == c.Id)
c.IsVoted = true;
});
});
}
}
private List<User> users; private List<User> users;
[JsonProperty(@"users")] [JsonProperty(@"users")]

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

@ -15,6 +15,8 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using System.Linq; using System.Linq;
using osu.Game.Online.Chat; using osu.Game.Online.Chat;
using osu.Framework.Allocation;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Overlays.Comments namespace osu.Game.Overlays.Comments
{ {
@ -81,7 +83,7 @@ namespace osu.Game.Overlays.Comments
Spacing = new Vector2(5, 0), Spacing = new Vector2(5, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
votePill = new VotePill(comment.VotesCount) votePill = new VotePill(comment)
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -336,28 +338,38 @@ namespace osu.Game.Overlays.Comments
private class VotePill : CircularContainer private class VotePill : CircularContainer
{ {
public VotePill(int count) private readonly Box background;
private readonly Comment comment;
public VotePill(Comment comment)
{ {
this.comment = comment;
AutoSizeAxes = Axes.X; AutoSizeAxes = Axes.X;
Height = 20; Height = 20;
Masking = true; Masking = true;
Children = new Drawable[] Children = new Drawable[]
{ {
new Box background = new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = OsuColour.Gray(0.05f)
}, },
new SpriteText new OsuSpriteText
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Margin = new MarginPadding { Horizontal = margin }, Margin = new MarginPadding { Horizontal = margin },
Font = OsuFont.GetFont(size: 14), Font = OsuFont.GetFont(size: 14),
Text = $"+{count}" Text = $"+{comment.VotesCount}"
} }
}; };
} }
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
background.Colour = comment.IsVoted ? colours.GreenLight : OsuColour.Gray(0.05f);
}
} }
} }
} }