From 5fc836d1f09cebf983313c9b91a5c252890c607a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 26 Sep 2022 16:15:18 +0900
Subject: [PATCH] Apply NRT to `BeatmapLeaderboard` / `MatchLeaderboard`

---
 .../Match/Components/MatchLeaderboard.cs      |  6 ++--
 .../Select/Leaderboards/BeatmapLeaderboard.cs | 35 +++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
index 64644be965..ee5ee576d8 100644
--- a/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
+++ b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Threading;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
@@ -16,7 +14,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
     public class MatchLeaderboard : Leaderboard<MatchLeaderboardScope, APIUserScoreAggregate>
     {
         [Resolved(typeof(Room), nameof(Room.RoomID))]
-        private Bindable<long?> roomId { get; set; }
+        private Bindable<long?> roomId { get; set; } = null!;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -33,7 +31,7 @@ namespace osu.Game.Screens.OnlinePlay.Match.Components
 
         protected override bool IsOnlineScope => true;
 
-        protected override APIRequest FetchScores(CancellationToken cancellationToken)
+        protected override APIRequest? FetchScores(CancellationToken cancellationToken)
         {
             if (roomId.Value == null)
                 return null;
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index 50204db2bf..161d4847bf 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -25,11 +23,11 @@ namespace osu.Game.Screens.Select.Leaderboards
 {
     public class BeatmapLeaderboard : Leaderboard<BeatmapLeaderboardScope, ScoreInfo>
     {
-        public Action<ScoreInfo> ScoreSelected;
+        public Action<ScoreInfo>? ScoreSelected;
 
-        private BeatmapInfo beatmapInfo;
+        private BeatmapInfo? beatmapInfo;
 
-        public BeatmapInfo BeatmapInfo
+        public BeatmapInfo? BeatmapInfo
         {
             get => beatmapInfo;
             set
@@ -70,26 +68,26 @@ namespace osu.Game.Screens.Select.Leaderboards
         }
 
         [Resolved]
-        private ScoreManager scoreManager { get; set; }
+        private ScoreManager scoreManager { get; set; } = null!;
 
         [Resolved]
-        private IBindable<RulesetInfo> ruleset { get; set; }
+        private IBindable<RulesetInfo> ruleset { get; set; } = null!;
 
         [Resolved]
-        private IBindable<IReadOnlyList<Mod>> mods { get; set; }
+        private IBindable<IReadOnlyList<Mod>> mods { get; set; } = null!;
 
         [Resolved]
-        private IAPIProvider api { get; set; }
+        private IAPIProvider api { get; set; } = null!;
 
         [Resolved]
-        private RulesetStore rulesets { get; set; }
+        private RulesetStore rulesets { get; set; } = null!;
 
         [Resolved]
-        private RealmAccess realm { get; set; }
+        private RealmAccess realm { get; set; } = null!;
 
-        private IDisposable scoreSubscription;
+        private IDisposable? scoreSubscription;
 
-        private GetScoresRequest scoreRetrievalRequest;
+        private GetScoresRequest? scoreRetrievalRequest;
 
         [BackgroundDependencyLoader]
         private void load()
@@ -104,10 +102,9 @@ namespace osu.Game.Screens.Select.Leaderboards
 
         protected override bool IsOnlineScope => Scope != BeatmapLeaderboardScope.Local;
 
-        protected override APIRequest FetchScores(CancellationToken cancellationToken)
+        protected override APIRequest? FetchScores(CancellationToken cancellationToken)
         {
             var fetchBeatmapInfo = BeatmapInfo;
-            var fetchRuleset = ruleset.Value ?? fetchBeatmapInfo.Ruleset;
 
             if (fetchBeatmapInfo == null)
             {
@@ -115,13 +112,15 @@ namespace osu.Game.Screens.Select.Leaderboards
                 return null;
             }
 
+            var fetchRuleset = ruleset.Value ?? fetchBeatmapInfo.Ruleset;
+
             if (Scope == BeatmapLeaderboardScope.Local)
             {
                 subscribeToLocalScores(fetchBeatmapInfo, cancellationToken);
                 return null;
             }
 
-            if (api?.IsLoggedIn != true)
+            if (!api.IsLoggedIn)
             {
                 SetErrorState(LeaderboardState.NotLoggedIn);
                 return null;
@@ -145,7 +144,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                 return null;
             }
 
-            IReadOnlyList<Mod> requestMods = null;
+            IReadOnlyList<Mod>? requestMods = null;
 
             if (filterMods && !mods.Value.Any())
                 // add nomod for the request
@@ -186,7 +185,7 @@ namespace osu.Game.Screens.Select.Leaderboards
                                           + $" AND {nameof(ScoreInfo.DeletePending)} == false"
                     , beatmapInfo.ID, ruleset.Value.ShortName), localScoresChanged);
 
-            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet changes, Exception exception)
+            void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? changes, Exception exception)
             {
                 if (cancellationToken.IsCancellationRequested)
                     return;