github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed WebSocketMessage -> SocketFrame

Browse Source
This commit is contained in:
RogueException
2016-10-07 17:24:16 -03:00
parent 81a0c12f48
commit cabf567359
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Discord.Net.WebSocket/API/DiscordSocketApiClient.cs
View File

@@ -48,7 +48,7 @@ namespace Discord.API
using (var reader = new StreamReader(decompressed)) using (var reader = new StreamReader(decompressed))
using (var jsonReader = new JsonTextReader(reader)) 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); 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 reader = new StringReader(text))
using (var jsonReader = new JsonTextReader(reader)) 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); await _receivedGatewayEvent.InvokeAsync((GatewayOpCode)msg.Operation, msg.Sequence, msg.Type, msg.Payload).ConfigureAwait(false);
} }
}; };
@@ -164,7 +164,7 @@ namespace Discord.API
//TODO: Add ETF //TODO: Add ETF
byte[] bytes = null; byte[] bytes = null;
payload = new WebSocketMessage { Operation = (int)opCode, Payload = payload }; payload = new SocketFrame { Operation = (int)opCode, Payload = payload };
if (payload != null) if (payload != null)
bytes = Encoding.UTF8.GetBytes(SerializeJson(payload)); bytes = Encoding.UTF8.GetBytes(SerializeJson(payload));
await RequestQueue.SendAsync(new WebSocketRequest(_gatewayClient, bytes, true, options)).ConfigureAwait(false); await RequestQueue.SendAsync(new WebSocketRequest(_gatewayClient, bytes, true, options)).ConfigureAwait(false);

6
src/Discord.Net.WebSocket/API/DiscordVoiceApiClient.cs
View File

@@ -68,14 +68,14 @@ namespace Discord.Audio
decompressed.Position = 0; decompressed.Position = 0;
using (var reader = new StreamReader(decompressed)) 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); await _receivedEvent.InvokeAsync((VoiceOpCode)msg.Operation, msg.Payload).ConfigureAwait(false);
} }
} }
}; };
_webSocketClient.TextMessage += async text => _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); await _receivedEvent.InvokeAsync((VoiceOpCode)msg.Operation, msg.Payload).ConfigureAwait(false);
}; };
_webSocketClient.Closed += async ex => _webSocketClient.Closed += async ex =>
@@ -103,7 +103,7 @@ namespace Discord.Audio
public async Task SendAsync(VoiceOpCode opCode, object payload, RequestOptions options = null) public async Task SendAsync(VoiceOpCode opCode, object payload, RequestOptions options = null)
{ {
byte[] bytes = null; byte[] bytes = null;
payload = new WebSocketMessage { Operation = (int)opCode, Payload = payload }; payload = new SocketFrame { Operation = (int)opCode, Payload = payload };
if (payload != null) if (payload != null)
bytes = Encoding.UTF8.GetBytes(SerializeJson(payload)); bytes = Encoding.UTF8.GetBytes(SerializeJson(payload));
await _webSocketClient.SendAsync(bytes, 0, bytes.Length, true).ConfigureAwait(false); await _webSocketClient.SendAsync(bytes, 0, bytes.Length, true).ConfigureAwait(false);

2
src/Discord.Net.Core/API/WebSocketMessage.cs → src/Discord.Net.WebSocket/API/SocketFrame.cs
View File

@@ -3,7 +3,7 @@ using Newtonsoft.Json;
namespace Discord.API namespace Discord.API
{ {
public class WebSocketMessage public class SocketFrame
{ {
[JsonProperty("op")] [JsonProperty("op")]
public int Operation { get; set; } public int Operation { get; set; }