From 9474156df4bb33bda65c0bd2d68d565825f1b3d1 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 26 Mar 2024 20:21:12 +0800
Subject: [PATCH] Improve equality implementations

---
 .../API/Requests/Responses/APIMenuContent.cs    | 10 +---------
 .../API/Requests/Responses/APIMenuImage.cs      | 17 +++++------------
 2 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/osu.Game/Online/API/Requests/Responses/APIMenuContent.cs b/osu.Game/Online/API/Requests/Responses/APIMenuContent.cs
index 7b53488030..6aad0f6c87 100644
--- a/osu.Game/Online/API/Requests/Responses/APIMenuContent.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIMenuContent.cs
@@ -23,15 +23,7 @@ namespace osu.Game.Online.API.Requests.Responses
             return Images.SequenceEqual(other.Images);
         }
 
-        public override bool Equals(object? obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            if (ReferenceEquals(this, obj)) return true;
-
-            if (obj.GetType() != GetType()) return false;
-
-            return Equals((APIMenuContent)obj);
-        }
+        public override bool Equals(object? other) => other is APIMenuContent content && Equals(content);
 
         public override int GetHashCode()
         {
diff --git a/osu.Game/Online/API/Requests/Responses/APIMenuImage.cs b/osu.Game/Online/API/Requests/Responses/APIMenuImage.cs
index 42129ca96e..8aff08099a 100644
--- a/osu.Game/Online/API/Requests/Responses/APIMenuImage.cs
+++ b/osu.Game/Online/API/Requests/Responses/APIMenuImage.cs
@@ -28,34 +28,27 @@ namespace osu.Game.Online.API.Requests.Responses
         /// The time at which this item should begin displaying. If <c>null</c>, will display immediately.
         /// </summary>
         [JsonProperty(@"begins")]
-        public DateTimeOffset? Begins { get; set; }
+        public DateTimeOffset? Begins { get; init; }
 
         /// <summary>
         /// The time at which this item should stop displaying. If <c>null</c>, will display indefinitely.
         /// </summary>
         [JsonProperty(@"expires")]
-        public DateTimeOffset? Expires { get; set; }
+        public DateTimeOffset? Expires { get; init; }
 
         public bool Equals(APIMenuImage? other)
         {
             if (ReferenceEquals(null, other)) return false;
             if (ReferenceEquals(this, other)) return true;
 
-            return Image == other.Image && Url == other.Url;
+            return Image == other.Image && Url == other.Url && Begins == other.Begins && Expires == other.Expires;
         }
 
-        public override bool Equals(object? obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            if (ReferenceEquals(this, obj)) return true;
-            if (obj.GetType() != GetType()) return false;
-
-            return Equals((APIMenuImage)obj);
-        }
+        public override bool Equals(object? other) => other is APIMenuImage content && Equals(content);
 
         public override int GetHashCode()
         {
-            return HashCode.Combine(Image, Url);
+            return HashCode.Combine(Image, Url, Begins, Expires);
         }
     }
 }