sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix TopLocalRank not handling legacy scores properly

Browse Source
This commit is contained in:
Salman Ahmed 2022-07-23 08:13:05 +03:00
parent 727fe76b60
commit 1d0306810a
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
osu.Game/Screens/Select/Carousel/TopLocalRank.cs
View File

@ -9,6 +9,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
@ -33,6 +34,9 @@ namespace osu.Game.Screens.Select.Carousel
[Resolved] [Resolved]
private RealmAccess realm { get; set; } private RealmAccess realm { get; set; }
[Resolved]
private ScoreManager scoreManager { get; set; }
[Resolved] [Resolved]
private IAPIProvider api { get; set; } private IAPIProvider api { get; set; }
@ -70,14 +74,29 @@ namespace osu.Game.Screens.Select.Carousel
.Filter($"{nameof(ScoreInfo.User)}.{nameof(RealmUser.OnlineID)} == $0" .Filter($"{nameof(ScoreInfo.User)}.{nameof(RealmUser.OnlineID)} == $0"
+ $" && {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $1" + $" && {nameof(ScoreInfo.BeatmapInfo)}.{nameof(BeatmapInfo.ID)} == $1"
+ $" && {nameof(ScoreInfo.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $2" + $" && {nameof(ScoreInfo.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $2"
+ $" && {nameof(ScoreInfo.DeletePending)} == false", api.LocalUser.Value.Id, beatmapInfo.ID, ruleset.Value.ShortName) + $" && {nameof(ScoreInfo.DeletePending)} == false", api.LocalUser.Value.Id, beatmapInfo.ID, ruleset.Value.ShortName),
.OrderByDescending(s => s.TotalScore), localScoresChanged);
(items, _, _) =>
{
updateable.Rank = items.FirstOrDefault()?.Rank;
updateable.Alpha = updateable.Rank != null ? 1 : 0;
});
}, true); }, true);
void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet changes, Exception error)
{
// This subscription may fire from changes to linked beatmaps, which we don't care about.
// It's currently not possible for a score to be modified after insertion, so we can safely ignore callbacks with only modifications.
if (changes?.HasCollectionChanges() == false)
return;
scoreOrderCancellationSource?.Cancel();
scoreManager.OrderByTotalScoreAsync(sender.Detach().ToArray(), (scoreOrderCancellationSource = new CancellationTokenSource()).Token)
.ContinueWith(ordered => Schedule(() =>
{
if (scoreOrderCancellationSource.IsCancellationRequested)
return;
updateable.Rank = ordered.GetResultSafely().FirstOrDefault()?.Rank;
updateable.Alpha = updateable.Rank != null ? 1 : 0;
}), TaskContinuationOptions.OnlyOnRanToCompletion);
}
} }
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)