From cabf5673598a76bf6896fd39ecdfefba9c6f2b8f Mon Sep 17 00:00:00 2001 From: RogueException Date: Fri, 7 Oct 2016 17:24:16 -0300 Subject: [PATCH] Renamed WebSocketMessage -> SocketFrame --- src/Discord.Net.WebSocket/API/DiscordSocketApiClient.cs | 6 +++--- src/Discord.Net.WebSocket/API/DiscordVoiceApiClient.cs | 6 +++--- .../API/SocketFrame.cs} | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename src/{Discord.Net.Core/API/WebSocketMessage.cs => Discord.Net.WebSocket/API/SocketFrame.cs} (93%) diff --git a/src/Discord.Net.WebSocket/API/DiscordSocketApiClient.cs b/src/Discord.Net.WebSocket/API/DiscordSocketApiClient.cs index 5aea2dcb4..b1bb61eb2 100644 --- a/src/Discord.Net.WebSocket/API/DiscordSocketApiClient.cs +++ b/src/Discord.Net.WebSocket/API/DiscordSocketApiClient.cs @@ -48,7 +48,7 @@ namespace Discord.API using (var reader = new StreamReader(decompressed)) using (var jsonReader = new JsonTextReader(reader)) { - var msg = _serializer.Deserialize(jsonReader); + var msg = _serializer.Deserialize(jsonReader); await _receivedGatewayEvent.InvokeAsync((GatewayOpCode)msg.Operation, msg.Sequence, msg.Type, msg.Payload).ConfigureAwait(false); } } @@ -58,7 +58,7 @@ namespace Discord.API using (var reader = new StringReader(text)) using (var jsonReader = new JsonTextReader(reader)) { - var msg = _serializer.Deserialize(jsonReader); + var msg = _serializer.Deserialize(jsonReader); await _receivedGatewayEvent.InvokeAsync((GatewayOpCode)msg.Operation, msg.Sequence, msg.Type, msg.Payload).ConfigureAwait(false); } }; @@ -164,7 +164,7 @@ namespace Discord.API //TODO: Add ETF byte[] bytes = null; - payload = new WebSocketMessage { Operation = (int)opCode, Payload = payload }; + payload = new SocketFrame { Operation = (int)opCode, Payload = payload }; if (payload != null) bytes = Encoding.UTF8.GetBytes(SerializeJson(payload)); await RequestQueue.SendAsync(new WebSocketRequest(_gatewayClient, bytes, true, options)).ConfigureAwait(false); diff --git a/src/Discord.Net.WebSocket/API/DiscordVoiceApiClient.cs b/src/Discord.Net.WebSocket/API/DiscordVoiceApiClient.cs index 62608b7e5..d7957b57b 100644 --- a/src/Discord.Net.WebSocket/API/DiscordVoiceApiClient.cs +++ b/src/Discord.Net.WebSocket/API/DiscordVoiceApiClient.cs @@ -68,14 +68,14 @@ namespace Discord.Audio decompressed.Position = 0; using (var reader = new StreamReader(decompressed)) { - var msg = JsonConvert.DeserializeObject(reader.ReadToEnd()); + var msg = JsonConvert.DeserializeObject(reader.ReadToEnd()); await _receivedEvent.InvokeAsync((VoiceOpCode)msg.Operation, msg.Payload).ConfigureAwait(false); } } }; _webSocketClient.TextMessage += async text => { - var msg = JsonConvert.DeserializeObject(text); + var msg = JsonConvert.DeserializeObject(text); await _receivedEvent.InvokeAsync((VoiceOpCode)msg.Operation, msg.Payload).ConfigureAwait(false); }; _webSocketClient.Closed += async ex => @@ -103,7 +103,7 @@ namespace Discord.Audio public async Task SendAsync(VoiceOpCode opCode, object payload, RequestOptions options = null) { byte[] bytes = null; - payload = new WebSocketMessage { Operation = (int)opCode, Payload = payload }; + payload = new SocketFrame { Operation = (int)opCode, Payload = payload }; if (payload != null) bytes = Encoding.UTF8.GetBytes(SerializeJson(payload)); await _webSocketClient.SendAsync(bytes, 0, bytes.Length, true).ConfigureAwait(false); diff --git a/src/Discord.Net.Core/API/WebSocketMessage.cs b/src/Discord.Net.WebSocket/API/SocketFrame.cs similarity index 93% rename from src/Discord.Net.Core/API/WebSocketMessage.cs rename to src/Discord.Net.WebSocket/API/SocketFrame.cs index e7c6a35b2..fd9367ca4 100644 --- a/src/Discord.Net.Core/API/WebSocketMessage.cs +++ b/src/Discord.Net.WebSocket/API/SocketFrame.cs @@ -3,7 +3,7 @@ using Newtonsoft.Json; namespace Discord.API { - public class WebSocketMessage + public class SocketFrame { [JsonProperty("op")] public int Operation { get; set; }