Add support for new Curator object

Auros · Jan 26, 2022 · 036536c · 036536c
1 parent dbd60ae
commit 036536c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 4 deletions.
diff --git a/BeatSaverSharp/BeatSaver.cs b/BeatSaverSharp/BeatSaver.cs
@@ -434,9 +434,6 @@ private bool GetOrAddBeatmapToCache(Beatmap beatmap, out Beatmap cachedAndOrBeat
                     if (beatmap.Automapper != cachedBeatmap.Automapper)
                         cachedBeatmap.Automapper = beatmap.Automapper;
 
-                    if (beatmap.Curator != cachedBeatmap.Curator)
-                        cachedBeatmap.Curator = beatmap.Curator;
-
                     if (beatmap.Description != cachedBeatmap.Description)
                         cachedBeatmap.Description = beatmap.Description;
 

diff --git a/BeatSaverSharp/Models/Beatmap.cs b/BeatSaverSharp/Models/Beatmap.cs
@@ -81,7 +81,7 @@ public class Beatmap : BeatSaverObject, IEquatable<Beatmap>
         /// The person who curated this map.
         /// </summary>
         [JsonProperty("curator")]
-        public string? Curator { get; internal set; }
+        public Curator? Curator { get; internal set; }
 
         private BeatmapVersion? _latestVersion;
 

diff --git a/BeatSaverSharp/Models/Curator.cs b/BeatSaverSharp/Models/Curator.cs
@@ -0,0 +1,42 @@
+using System;
+using Newtonsoft.Json;
+
+namespace BeatSaverSharp.Models
+{
+    public class Curator : IEquatable<Curator>
+    {
+        /// <summary>
+        /// Id of the curator.
+        /// </summary>
+        [JsonProperty("id")]
+        public int Id { get; internal set; }
+
+        /// <summary>
+        /// Name of the curator.
+        /// </summary>
+        [JsonProperty("name")]
+        public string Name { get; internal set; } = null!;
+
+        /// <summary>
+        /// Link of the avatar of the curator.
+        /// </summary>
+        [JsonProperty("avatar")]
+        public string Avatar { get; internal set; } = null!;
+
+        /// <summary>
+        /// User account type of the curator.
+        /// </summary>
+        [JsonProperty("type")]
+        public string Type { get; internal set; } = null!;
+
+        internal Curator() { }
+
+        // Equality Methods
+
+        public bool Equals(Curator? other) => Id == other?.Id;
+        public override int GetHashCode() => Id.GetHashCode();
+        public override bool Equals(object? obj) => Equals(obj as Curator);
+        public static bool operator ==(Curator left, Curator right) => Equals(left, right);
+        public static bool operator !=(Curator left, Curator right) => !Equals(left, right);
+    }
+}