Renamed WebSocketMessage -> SocketFrame

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<WebSocketMessage>(jsonReader);
+                        var msg = _serializer.Deserialize<SocketFrame>(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<WebSocketMessage>(jsonReader);
+                    var msg = _serializer.Deserialize<SocketFrame>(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);

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<WebSocketMessage>(reader.ReadToEnd());
+                        var msg = JsonConvert.DeserializeObject<SocketFrame>(reader.ReadToEnd());
                         await _receivedEvent.InvokeAsync((VoiceOpCode)msg.Operation, msg.Payload).ConfigureAwait(false);
                     }
                 }
             };
             _webSocketClient.TextMessage += async text =>
             {
-                var msg = JsonConvert.DeserializeObject<WebSocketMessage>(text);
+                var msg = JsonConvert.DeserializeObject<SocketFrame>(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);

src/Discord.Net.Core/API/WebSocketMessage.cs → 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; }