From 199fb0fd8563e1baa242428fa75b9560b6dc3704 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 10 Feb 2023 16:25:14 +0900
Subject: [PATCH] Apply NRT to `ClickableAvatar` and `UpdateableAvatar`

---
 osu.Game/Users/Drawables/ClickableAvatar.cs  | 10 ++++------
 osu.Game/Users/Drawables/UpdateableAvatar.cs | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/osu.Game/Users/Drawables/ClickableAvatar.cs b/osu.Game/Users/Drawables/ClickableAvatar.cs
index e13fb6a819..bb57958239 100644
--- a/osu.Game/Users/Drawables/ClickableAvatar.cs
+++ b/osu.Game/Users/Drawables/ClickableAvatar.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 osu.Framework.Allocation;
 using osu.Framework.Input.Events;
@@ -34,16 +32,16 @@ namespace osu.Game.Users.Drawables
         /// </summary>
         public bool ShowUsernameTooltip { get; set; }
 
-        private readonly APIUser user;
+        private readonly APIUser? user;
 
-        [Resolved(CanBeNull = true)]
-        private OsuGame game { get; set; }
+        [Resolved]
+        private OsuGame? game { get; set; }
 
         /// <summary>
         /// A clickable avatar for the specified user, with UI sounds included.
         /// </summary>
         /// <param name="user">The user. A null value will get a placeholder avatar.</param>
-        public ClickableAvatar(APIUser user = null)
+        public ClickableAvatar(APIUser? user = null)
         {
             this.user = user;
 
diff --git a/osu.Game/Users/Drawables/UpdateableAvatar.cs b/osu.Game/Users/Drawables/UpdateableAvatar.cs
index 9611156624..c659685807 100644
--- a/osu.Game/Users/Drawables/UpdateableAvatar.cs
+++ b/osu.Game/Users/Drawables/UpdateableAvatar.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 osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
@@ -13,9 +11,9 @@ namespace osu.Game.Users.Drawables
     /// <summary>
     /// An avatar which can update to a new user when needed.
     /// </summary>
-    public partial class UpdateableAvatar : ModelBackedDrawable<APIUser>
+    public partial class UpdateableAvatar : ModelBackedDrawable<APIUser?>
     {
-        public APIUser User
+        public APIUser? User
         {
             get => Model;
             set => Model = value;
@@ -58,7 +56,7 @@ namespace osu.Game.Users.Drawables
         /// <param name="isInteractive">If set to true, hover/click sounds will play and clicking the avatar will open the user's profile.</param>
         /// <param name="showUsernameTooltip">Whether to show the username rather than "view profile" on the tooltip. (note: this only applies if <paramref name="isInteractive"/> is also true)</param>
         /// <param name="showGuestOnNull">Whether to show a default guest representation on null user (as opposed to nothing).</param>
-        public UpdateableAvatar(APIUser user = null, bool isInteractive = true, bool showUsernameTooltip = false, bool showGuestOnNull = true)
+        public UpdateableAvatar(APIUser? user = null, bool isInteractive = true, bool showUsernameTooltip = false, bool showGuestOnNull = true)
         {
             this.isInteractive = isInteractive;
             this.showUsernameTooltip = showUsernameTooltip;
@@ -67,7 +65,7 @@ namespace osu.Game.Users.Drawables
             User = user;
         }
 
-        protected override Drawable CreateDrawable(APIUser user)
+        protected override Drawable? CreateDrawable(APIUser? user)
         {
             if (user == null && !showGuestOnNull)
                 return null;