From f1c7742103f66210689620b04ed15e2664f79065 Mon Sep 17 00:00:00 2001 From: Still Hsu <341464@gmail.com> Date: Thu, 26 Apr 2018 22:09:34 +0800 Subject: [PATCH] Rename AlbumArt to AlbumArtUrl for consistency --- src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs | 8 +++++--- src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs b/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs index cfb2f0a26..8b966d68b 100644 --- a/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs +++ b/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs @@ -8,13 +8,15 @@ namespace Discord public class SpotifyGame : Game { public IReadOnlyCollection Artists { get; internal set; } - public string AlbumArt { get; internal set; } public string AlbumTitle { get; internal set; } public string TrackTitle { get; internal set; } + public TimeSpan? Duration { get; internal set; } + public string TrackId { get; internal set; } - public string TrackUrl { get; internal set; } public string SessionId { get; internal set; } - public TimeSpan? Duration { get; internal set; } + + public string AlbumArtUrl { get; internal set; } + public string TrackUrl { get; internal set; } internal SpotifyGame() { } diff --git a/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs b/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs index 350d92d16..e8dc4b5f0 100644 --- a/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs +++ b/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs @@ -24,7 +24,7 @@ namespace Discord.WebSocket TrackTitle = model.Details.GetValueOrDefault(), Artists = model.State.GetValueOrDefault()?.Split(';').Select(x=>x?.Trim()).ToImmutableArray(), Duration = timestamps?.End - timestamps?.Start, - AlbumArt = albumArtId != null ? CDN.GetSpotifyAlbumArtUrl(albumArtId) : null, + AlbumArtUrl = albumArtId != null ? CDN.GetSpotifyAlbumArtUrl(albumArtId) : null, Type = ActivityType.Listening }; }