From 5cb662280cb5e0b64e2df337a61cee178a1baa3d Mon Sep 17 00:00:00 2001
From: LtLi0n <LtLi0n@users.noreply.github.com>
Date: Sun, 10 Nov 2019 23:53:02 +0200
Subject: [PATCH] Moved Duration to be initialized within model construction.

---
 src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs  | 2 +-
 src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs b/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs
index 2cde168c5..efe9f7904 100644
--- a/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs
+++ b/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs
@@ -54,7 +54,7 @@ namespace Discord
         /// <returns>
         ///     A <see cref="TimeSpan"/> containing the duration of the song.
         /// </returns>
-        public TimeSpan? Duration => EndsAt - StartedAt;
+        public TimeSpan? Duration { get; internal set; }
 
         /// <summary>
         ///     Gets the elapsed duration of the song.
diff --git a/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs b/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs
index 093097cf9..5149eea5b 100644
--- a/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs
+++ b/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs
@@ -40,6 +40,7 @@ namespace Discord.WebSocket
                     Artists = model.State.GetValueOrDefault()?.Split(';').Select(x=>x?.Trim()).ToImmutableArray(),
                     StartedAt = timestamps?.Start,
                     EndsAt = timestamps?.End,
+                    Duration = timestamps?.End - timestamps?.Start,
                     AlbumArtUrl = albumArtId != null ? CDN.GetSpotifyAlbumArtUrl(albumArtId) : null,
                     Type = ActivityType.Listening,
                     Flags = model.Flags.GetValueOrDefault(),