From 857b023ad176691a4068500972b060976ac6e304 Mon Sep 17 00:00:00 2001
From: Hsu Still <341464@gmail.com>
Date: Sat, 3 Mar 2018 03:00:04 +0800
Subject: [PATCH] Add changes according to review

+ Make `ApplicationId` nullable
+ Move ctor after props
---
 src/Discord.Net.Core/Entities/Activities/Game.cs         | 3 +--
 src/Discord.Net.Core/Entities/Activities/GameAsset.cs    | 8 ++++----
 src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs  | 4 ++--
 src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Discord.Net.Core/Entities/Activities/Game.cs b/src/Discord.Net.Core/Entities/Activities/Game.cs
index 0e1918dca..179ad4eaa 100644
--- a/src/Discord.Net.Core/Entities/Activities/Game.cs
+++ b/src/Discord.Net.Core/Entities/Activities/Game.cs
@@ -5,11 +5,10 @@ namespace Discord
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     public class Game : IActivity
     {
-        internal Game() { }
-
         public string Name { get; internal set; }
         public ActivityType Type { get; internal set; }
 
+        internal Game() { }
         public Game(string name, ActivityType type = ActivityType.Playing)
         {
             Name = name;
diff --git a/src/Discord.Net.Core/Entities/Activities/GameAsset.cs b/src/Discord.Net.Core/Entities/Activities/GameAsset.cs
index 385f37214..02c29ba41 100644
--- a/src/Discord.Net.Core/Entities/Activities/GameAsset.cs
+++ b/src/Discord.Net.Core/Entities/Activities/GameAsset.cs
@@ -1,15 +1,15 @@
-namespace Discord
+namespace Discord
 {
     public class GameAsset
     {
         internal GameAsset() { }
 
-        internal ulong ApplicationId { get; set; }
+        internal ulong? ApplicationId { get; set; }
         
         public string Text { get; internal set; }
         public string ImageId { get; internal set; }
         
         public string GetImageUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
-            => CDN.GetRichAssetUrl(ApplicationId, ImageId, size, format);
+            => ApplicationId.HasValue ? CDN.GetRichAssetUrl(ApplicationId.Value, ImageId, size, format) : null;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs b/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs
index c13c7ac20..b8a4b8043 100644
--- a/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs
+++ b/src/Discord.Net.Core/Entities/Activities/SpotifyGame.cs
@@ -7,8 +7,6 @@ namespace Discord
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     public class SpotifyGame : Game
     {
-        internal SpotifyGame() { }
-
         public string[] Artists { get; internal set; }
         public string AlbumArt { get; internal set; }
         public string AlbumTitle { get; internal set; }
@@ -17,6 +15,8 @@ namespace Discord
         public string SessionId { get; internal set; }
         public TimeSpan? Duration { get; internal set; }
 
+        internal SpotifyGame() { }
+
         public override string ToString() => Name;
         private string DebuggerDisplay => $"{Name} (Spotify)";
     }
diff --git a/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs b/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs
index 99cc90c2c..f268a7ff2 100644
--- a/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs
+++ b/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs
@@ -55,7 +55,7 @@ namespace Discord.WebSocket
         }
 
         // (Small, Large)
-        public static GameAsset[] ToEntity(this API.GameAssets model, ulong appId = 0)
+        public static GameAsset[] ToEntity(this API.GameAssets model, ulong? appId = null)
         {
             return new GameAsset[]
             {