From cc5fc8d288a8b786e9f8209f195ca841166e3764 Mon Sep 17 00:00:00 2001
From: quin lynch <lynchquin@gmail.com>
Date: Sun, 8 Aug 2021 13:56:01 -0300
Subject: [PATCH] Fix serialization error

---
 src/Discord.Net.Rest/API/Common/Game.cs         |  4 ++--
 .../Discord.Net.WebSocket.xml                   | 10 ++++++++++
 .../DiscordSocketApiClient.cs                   | 17 ++++++++++++++---
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/Discord.Net.Rest/API/Common/Game.cs b/src/Discord.Net.Rest/API/Common/Game.cs
index 294b0c7fd..775b6aabc 100644
--- a/src/Discord.Net.Rest/API/Common/Game.cs
+++ b/src/Discord.Net.Rest/API/Common/Game.cs
@@ -41,8 +41,8 @@ namespace Discord.API
         public Optional<Emoji> Emoji { get; set; }
         [JsonProperty("created_at")]
         public Optional<long> CreatedAt { get; set; }
-        [JsonProperty("buttons")]
-        public Optional<RichPresenceButton[]> Buttons { get; set; }
+        //[JsonProperty("buttons")]
+        //public Optional<RichPresenceButton[]> Buttons { get; set; }
 
         [OnError]
         internal void OnError(StreamingContext context, ErrorContext errorContext)
diff --git a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.xml b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.xml
index 576fcc5f0..6a41708c8 100644
--- a/src/Discord.Net.WebSocket/Discord.Net.WebSocket.xml
+++ b/src/Discord.Net.WebSocket/Discord.Net.WebSocket.xml
@@ -3628,6 +3628,16 @@
         <member name="M:Discord.WebSocket.SocketMessageComponent.FollowupAsync(System.String,Discord.Embed[],System.Boolean,System.Boolean,Discord.AllowedMentions,Discord.RequestOptions,Discord.MessageComponent,Discord.Embed)">
             <inheritdoc/>
         </member>
+        <member name="M:Discord.WebSocket.SocketMessageComponent.DeferLoadingAsync(System.Boolean,Discord.RequestOptions)">
+            <summary>
+                Defers an interaction and responds with type 5 (<see cref="F:Discord.InteractionResponseType.DeferredChannelMessageWithSource"/>)
+            </summary>
+            <param name="ephemeral"><see langword="true"/> to send this message ephemerally, otherwise <see langword="false"/>.</param>
+            <param name="options">The request options for this async request.</param>
+            <returns>
+                A task that represents the asynchronous operation of acknowledging the interaction.
+            </returns>
+        </member>
         <member name="M:Discord.WebSocket.SocketMessageComponent.DeferAsync(System.Boolean,Discord.RequestOptions)">
             <inheritdoc/>
         </member>
diff --git a/src/Discord.Net.WebSocket/DiscordSocketApiClient.cs b/src/Discord.Net.WebSocket/DiscordSocketApiClient.cs
index a862b5778..11ecc0867 100644
--- a/src/Discord.Net.WebSocket/DiscordSocketApiClient.cs
+++ b/src/Discord.Net.WebSocket/DiscordSocketApiClient.cs
@@ -79,7 +79,7 @@ namespace Discord.API
                         if (msg != null)
                         {
 #if DEBUG_PACKETS
-                            Console.WriteLine($"<- {msg.Operation} [{msg.Type ?? "none"}] : {(msg.Payload as Newtonsoft.Json.Linq.JToken)?.ToString().Length}");
+                            Console.WriteLine($"<- {(GatewayOpCode)msg.Operation} [{msg.Type ?? "none"}] : {(msg.Payload as Newtonsoft.Json.Linq.JToken)?.ToString().Length}");
 #endif
 
                             await _receivedGatewayEvent.InvokeAsync((GatewayOpCode)msg.Operation, msg.Sequence, msg.Type, msg.Payload).ConfigureAwait(false);
@@ -96,7 +96,7 @@ namespace Discord.API
                     if (msg != null)
                     {
 #if DEBUG_PACKETS
-                        Console.WriteLine($"<- {msg.Operation} [{msg.Type ?? "none"}] : {(msg.Payload as Newtonsoft.Json.Linq.JToken)?.ToString().Length}");
+                        Console.WriteLine($"<- {(GatewayOpCode)msg.Operation} [{msg.Type ?? "none"}] : {(msg.Payload as Newtonsoft.Json.Linq.JToken)?.ToString().Length}");
 #endif
 
                         await _receivedGatewayEvent.InvokeAsync((GatewayOpCode)msg.Operation, msg.Sequence, msg.Type, msg.Payload).ConfigureAwait(false);
@@ -105,6 +105,10 @@ namespace Discord.API
             };
             WebSocketClient.Closed += async ex =>
             {
+#if DEBUG_PACKETS
+                Console.WriteLine(ex);
+#endif
+
                 await DisconnectAsync().ConfigureAwait(false);
                 await _disconnectedEvent.InvokeAsync(ex).ConfigureAwait(false);
             };
@@ -166,6 +170,11 @@ namespace Discord.API
                     var gatewayResponse = await GetGatewayAsync().ConfigureAwait(false);
                     _gatewayUrl = $"{gatewayResponse.Url}?v={DiscordConfig.APIVersion}&encoding={DiscordSocketConfig.GatewayEncoding}&compress=zlib-stream";
                 }
+
+#if DEBUG
+                Console.WriteLine("Connecting to gateway: " + _gatewayUrl);
+#endif
+
                 await WebSocketClient.ConnectAsync(_gatewayUrl).ConfigureAwait(false);
 
                 ConnectionState = ConnectionState.Connected;
@@ -237,7 +246,9 @@ namespace Discord.API
             options = RequestOptions.CreateOrClone(options);
             var props = new Dictionary<string, string>
             {
-                ["$device"] = "Discord.Net Labs"
+                ["$device"] = "Discord.Net Labs",
+                ["$os"] = Environment.OSVersion.Platform.ToString(),
+                [$"browser"] = "Discord.Net Labs"
             };
             var msg = new IdentifyParams()
             {