fix: add missing properties and update playerUpdate object

Aiko-IT-Systems · Jan 22, 2025 · 829d290 · 829d290
1 parent 22f09ed
commit 829d290
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 17 deletions.
diff --git a/DisCatSharp.Lavalink/Entities/LavalinkTrack.cs b/DisCatSharp.Lavalink/Entities/LavalinkTrack.cs
@@ -28,6 +28,12 @@ public sealed class LavalinkTrack
 	/// </summary>
 	[JsonProperty("pluginInfo")]
 	public LavalinkPluginInfo PluginInfo { get; internal set; }
+
+	/// <summary>
+	///     Gets the user info.
+	/// </summary>
+	[JsonProperty("userData")]
+	public object? UserData { get; internal set; }
 }
 
 /// <summary>

diff --git a/DisCatSharp.Lavalink/LavalinkGuildPlayer.cs b/DisCatSharp.Lavalink/LavalinkGuildPlayer.cs
@@ -305,7 +305,8 @@ public async Task<LavalinkGuildPlayer> UpdateAsync(Action<LavalinkPlayerUpdateMo
 			mdl.EncodedTrack, mdl.Identifier,
 			mdl.Position, mdl.EndTime,
 			mdl.Volume, mdl.Paused,
-			mdl.Filters
+			mdl.Filters,
+			mdl.UserData
 		).ConfigureAwait(false);
 		return this;
 	}

diff --git a/DisCatSharp.Lavalink/LavalinkRestClient.cs b/DisCatSharp.Lavalink/LavalinkRestClient.cs
@@ -297,26 +297,34 @@ internal async Task<LavalinkPlayer> GetPlayerAsync(string sessionId, ulong guild
 	/// <param name="volume">The volume.</param>
 	/// <param name="paused">Whether to pause the track.</param>
 	/// <param name="filters">The filters.</param>
+	/// <param name="userData">The user data.</param>
 	/// <returns>The updated <see cref="LavalinkPlayer" /> object.</returns>
 	internal async Task<LavalinkPlayer> UpdatePlayerAsync(
 		string sessionId,
 		ulong guildId,
 		bool noReplace = false,
 		Optional<string?> encodedTrack = default,
-		Optional<string> identifier = default,
+		Optional<string?> identifier = default,
 		Optional<int> position = default,
 		Optional<int?> endTime = default,
 		Optional<int> volume = default,
 		Optional<bool> paused = default,
-		Optional<LavalinkFilters> filters = default
+		Optional<LavalinkFilters> filters = default,
+		Optional<object?> userData = default
 	)
 	{
 		var queryDict = this.GetDefaultParams();
 		queryDict.Add("noReplace", noReplace.ToString().ToLower());
 		var pld = new LavalinkRestPlayerUpdatePayload(guildId.ToString())
 		{
-			EncodedTrack = encodedTrack,
-			Identifier = identifier,
+			Track = encodedTrack.HasValue || identifier.HasValue
+				? new LavalinkRestPlayerUpdatePlayerTrackPayload()
+				{
+					Encoded = encodedTrack,
+					Identifier = identifier,
+					UserData = userData
+				}
+				: Optional.None,
 			Position = position,
 			EndTime = endTime,
 			Volume = volume,

diff --git a/DisCatSharp.Lavalink/Models/LavalinkPlayerUpdateModel.cs b/DisCatSharp.Lavalink/Models/LavalinkPlayerUpdateModel.cs
@@ -64,4 +64,10 @@ internal LavalinkPlayerUpdateModel()
 	/// </summary>
 	[JsonProperty("filters")]
 	public Optional<LavalinkFilters> Filters { internal get; set; }
+
+	/// <summary>
+	/// Gets or sets the user data.
+	/// </summary>
+	[JsonProperty("userData")]
+	public Optional<object?> UserData { get; set; }
 }
diff --git a/DisCatSharp.Lavalink/Payloads/LavalinkRestPlayerUpdatePayload.cs b/DisCatSharp.Lavalink/Payloads/LavalinkRestPlayerUpdatePayload.cs
@@ -25,18 +25,6 @@ internal LavalinkRestPlayerUpdatePayload(string guildId)
 	[JsonProperty("guildId")]
 	internal string GuildId { get; set; }
 
-	/// <summary>
-	///     Gets or sets the encoded track.
-	/// </summary>
-	[JsonProperty("encodedTrack")]
-	internal Optional<string?> EncodedTrack { get; set; }
-
-	/// <summary>
-	///     Gets or sets the identifier.
-	/// </summary>
-	[JsonProperty("identifier")]
-	internal Optional<string> Identifier { get; set; }
-
 	/// <summary>
 	///     Gets or sets the start or seek position.
 	/// </summary>
@@ -66,4 +54,34 @@ internal LavalinkRestPlayerUpdatePayload(string guildId)
 	/// </summary>
 	[JsonProperty("filters")]
 	internal Optional<LavalinkFilters> Filters { get; set; }
+
+	/// <summary>
+	///    Gets or sets the track.
+	/// </summary>
+	[JsonProperty("track")]
+	internal Optional<LavalinkRestPlayerUpdatePlayerTrackPayload> Track { get; set; }
+}
+
+/// <summary>
+///    The lavalink rest player update player track payload.
+/// </summary>
+internal sealed class LavalinkRestPlayerUpdatePlayerTrackPayload
+{
+	/// <summary>
+	///     Gets or sets the encoded track.
+	/// </summary>
+	[JsonProperty("encoded")]
+	internal Optional<string?> Encoded { get; set; }
+
+	/// <summary>
+	///     Gets or sets the identifier.
+	/// </summary>
+	[JsonProperty("identifier")]
+	internal Optional<string?> Identifier { get; set; }
+
+	/// <summary>
+	/// Gets or sets the user data.
+	/// </summary>
+	[JsonProperty("userData")]
+	public Optional<object?> UserData { get; set; }
 }