Remove GameAssets, refactored to GameAsset

src/Discord.Net.Core/Entities/Activities/GameAssets.cs → src/Discord.Net.Core/Entities/Activities/GameAsset.cs

@@ -1,11 +1,5 @@
 namespace Discord
 {
-    public class GameAssets
-    {
-        public GameAsset Small { get; internal set; }
-        public GameAsset Large { get; internal set; }
-    }
-
     public class GameAsset
     {
         internal GameAsset() { }

src/Discord.Net.Core/Entities/Activities/RichGame.cs

@@ -8,7 +8,8 @@ namespace Discord
         public string Details { get; internal set;}
         public string State { get; internal set;}
         public ulong ApplicationId { get; internal set; }
-        public GameAssets Assets { get; internal set; }
+        public GameAsset SmallAsset { get; internal set; }
+        public GameAsset LargeAsset { get; internal set; }
         public GameParty Party { get; internal set; }
         public GameSecrets Secrets { get; internal set; }
         public GameTimestamps Timestamps { get; internal set; }

src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs

@@ -8,18 +8,18 @@
             if (model.ApplicationId.IsSpecified)
             {
                 ulong appId = model.ApplicationId.Value;
+                var assets = model.Assets.GetValueOrDefault()?.ToEntity(appId);
                 return new RichGame
                 {
                     ApplicationId = appId,
                     Name = model.Name,
                     Details = model.Details.GetValueOrDefault(),
                     State = model.State.GetValueOrDefault(),
-                    
-                    Assets = model.Assets.GetValueOrDefault()?.ToEntity(appId),
+                    SmallAsset = assets?[0],
+                    LargeAsset = assets?[1],
                     Party = model.Party.GetValueOrDefault()?.ToEntity(),
                     Secrets = model.Secrets.GetValueOrDefault()?.ToEntity(),
                     Timestamps = model.Timestamps.GetValueOrDefault()?.ToEntity()
-                    
                 };
             }
             // Stream Game
@@ -34,22 +34,23 @@
             return new Game(model.Name);
         }
 
-        public static GameAssets ToEntity(this API.GameAssets model, ulong appId)
+        // (Small, Large)
+        public static GameAsset[] ToEntity(this API.GameAssets model, ulong appId)
         {
-            return new GameAssets
+            return new GameAsset[]
             {
-                Large = new GameAsset
+                model.SmallImage.IsSpecified ? new GameAsset
                 {
                     ApplicationId = appId,
-                    ImageId = model.LargeImage.GetValueOrDefault(),
-                    Text = model.LargeText.GetValueOrDefault()
-                },
-                Small = new GameAsset
+                    ImageId = model.SmallImage.GetValueOrDefault(),
+                    Text = model.SmallText.GetValueOrDefault()
+                } : null,
+                model.LargeImage.IsSpecified ? new GameAsset
                 {
                     ApplicationId = appId,
                     ImageId = model.LargeImage.GetValueOrDefault(),
                     Text = model.LargeText.GetValueOrDefault()
-                },
+                } : null,
             };
         }