diff --git a/osu.Android.props b/osu.Android.props
index 702591231b..25bde037db 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -54,6 +54,6 @@
-
+
diff --git a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
index 9c526c4f81..2a43ba3f99 100644
--- a/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
+++ b/osu.Game.Tests/Visual/Online/TestSceneCommentsContainer.cs
@@ -10,6 +10,8 @@ using osu.Framework.Graphics;
using osu.Game.Overlays.Comments;
using osu.Game.Overlays;
using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Game.Users;
namespace osu.Game.Tests.Visual.Online
{
@@ -37,23 +39,29 @@ namespace osu.Game.Tests.Visual.Online
public TestSceneCommentsContainer()
{
BasicScrollContainer scroll;
- CommentsContainer comments;
+ TestCommentsContainer comments;
Add(scroll = new BasicScrollContainer
{
RelativeSizeAxes = Axes.Both,
- Child = comments = new CommentsContainer()
+ Child = comments = new TestCommentsContainer()
});
AddStep("Big Black comments", () => comments.ShowComments(CommentableType.Beatmapset, 41823));
AddStep("Airman comments", () => comments.ShowComments(CommentableType.Beatmapset, 24313));
AddStep("Lazer build comments", () => comments.ShowComments(CommentableType.Build, 4772));
AddStep("News comments", () => comments.ShowComments(CommentableType.NewsPost, 715));
+ AddStep("Trigger user change", comments.User.TriggerChange);
AddStep("Idle state", () =>
{
scroll.Clear();
- scroll.Add(comments = new CommentsContainer());
+ scroll.Add(comments = new TestCommentsContainer());
});
}
+
+ private class TestCommentsContainer : CommentsContainer
+ {
+ public new Bindable User => base.User;
+ }
}
}
diff --git a/osu.Game/Overlays/Comments/CommentsContainer.cs b/osu.Game/Overlays/Comments/CommentsContainer.cs
index 8761b88b1e..33a6be0d7a 100644
--- a/osu.Game/Overlays/Comments/CommentsContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentsContainer.cs
@@ -12,6 +12,7 @@ using osu.Game.Online.API.Requests.Responses;
using System.Threading;
using System.Linq;
using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Game.Users;
namespace osu.Game.Overlays.Comments
{
@@ -23,6 +24,8 @@ namespace osu.Game.Overlays.Comments
public readonly Bindable Sort = new Bindable();
public readonly BindableBool ShowDeleted = new BindableBool();
+ protected readonly Bindable User = new Bindable();
+
[Resolved]
private IAPIProvider api { get; set; }
@@ -109,10 +112,13 @@ namespace osu.Game.Overlays.Comments
}
}
});
+
+ User.BindTo(api.LocalUser);
}
protected override void LoadComplete()
{
+ User.BindValueChanged(_ => refetchComments());
Sort.BindValueChanged(_ => refetchComments(), true);
base.LoadComplete();
}
@@ -148,7 +154,7 @@ namespace osu.Game.Overlays.Comments
loadCancellation?.Cancel();
request = new GetCommentsRequest(type, id.Value, Sort.Value, currentPage++);
request.Success += onSuccess;
- api.Queue(request);
+ api.PerformAsync(request);
}
private void clearComments()
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 81f59a4993..21c9eab4c6 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -23,7 +23,7 @@
-
+
diff --git a/osu.iOS.props b/osu.iOS.props
index 8e359970a1..3ed25360c5 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -74,7 +74,7 @@
-
+
@@ -82,7 +82,7 @@
-
+