Refactor Games, support reading Rich Presences (#877)

* Add API-level support for Rich Presences * Add library-level support for Game presences * Add model conversions for outgoing+incoming rich presences * Refactored Game into Activities * Integrated Activities with user entities rebase hell from 5f3cb947a92f4fd01cc4df47ca548180036b47f3 * Fix JSON converters for Activities * Finish rebase, activity should be set on BaseSocketClient * Use ApplicationId to define a rich presence * Added SetActivityAsync to Base and Sharded Socket clients * Remove public parameterless Game constructor * Remove GameAssets, refactored to GameAsset * Hide constructors for types that should be read-only * Revert changes to Discord.Net.sln got damned visual studio caching * Refactor GameParty to use dedicated current/capacity values Per feedback from @khionu
2017-12-23 14:58:35 -05:00
parent 678a7238e6
commit 34b4e5a6d2
28 changed files with 376 additions and 58 deletions
--- a/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs
+++ b/src/Discord.Net.WebSocket/Extensions/EntityExtensions.cs
@@ -2,11 +2,83 @@
 {
    internal static class EntityExtensions
    {
-        public static Game ToEntity(this API.Game model)
+        public static IActivity ToEntity(this API.Game model)
        {
-            return new Game(model.Name,
-                model.StreamUrl.GetValueOrDefault(null),
-                model.StreamType.GetValueOrDefault(null) ?? StreamType.NotStreaming);
+            // Rich Game
+            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(),
+                    SmallAsset = assets?[0],
+                    LargeAsset = assets?[1],
+                    Party = model.Party.GetValueOrDefault()?.ToEntity(),
+                    Secrets = model.Secrets.GetValueOrDefault()?.ToEntity(),
+                    Timestamps = model.Timestamps.GetValueOrDefault()?.ToEntity()
+                };
+            }
+            // Stream Game
+            if (model.StreamUrl.IsSpecified)
+            {
+                return new StreamingGame(
+                    model.Name, 
+                    model.StreamUrl.Value, 
+                    model.StreamType.Value.GetValueOrDefault());
+            }
+            // Normal Game
+            return new Game(model.Name);
+        }
+
+        // (Small, Large)
+        public static GameAsset[] ToEntity(this API.GameAssets model, ulong appId)
+        {
+            return new GameAsset[]
+            {
+                model.SmallImage.IsSpecified ? new GameAsset
+                {
+                    ApplicationId = appId,
+                    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,
+            };
+        }
+
+        public static GameParty ToEntity(this API.GameParty model)
+        {
+            // Discord will probably send bad data since they don't validate anything
+            int current = 0, cap = 0;
+            if (model.Size.Length == 2)
+            {
+                current = model.Size[0];
+                cap = model.Size[1];
+            }
+            return new GameParty
+            {
+                Id = model.Id,
+                Members = current,
+                Capacity = cap,
+            };
+        }
+
+        public static GameSecrets ToEntity(this API.GameSecrets model)
+        {
+            return new GameSecrets(model.Match, model.Join, model.Spectate);
+        }
+
+        public static GameTimestamps ToEntity(this API.GameTimestamps model)
+        {
+            return new GameTimestamps(model.Start.ToNullable(), model.End.ToNullable());
        }
    }
 }