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

Renamed RpcMessage -> RpcFrame

Browse Source
This commit is contained in:
RogueException
2016-10-07 17:27:56 -03:00
parent cabf567359
commit fc0b73f7a4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Discord.Net.Rpc/API/DiscordRpcApiClient.cs
View File

@@ -91,7 +91,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<API.Rpc.RpcMessage>(jsonReader); var msg = _serializer.Deserialize<API.Rpc.RpcFrame>(jsonReader);
await _receivedRpcEvent.InvokeAsync(msg.Cmd, msg.Event, msg.Data).ConfigureAwait(false); await _receivedRpcEvent.InvokeAsync(msg.Cmd, msg.Event, msg.Data).ConfigureAwait(false);
if (msg.Nonce.IsSpecified && msg.Nonce.Value.HasValue) if (msg.Nonce.IsSpecified && msg.Nonce.Value.HasValue)
ProcessMessage(msg); ProcessMessage(msg);
@@ -103,7 +103,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<API.Rpc.RpcMessage>(jsonReader); var msg = _serializer.Deserialize<API.Rpc.RpcFrame>(jsonReader);
await _receivedRpcEvent.InvokeAsync(msg.Cmd, msg.Event, msg.Data).ConfigureAwait(false); await _receivedRpcEvent.InvokeAsync(msg.Cmd, msg.Event, msg.Data).ConfigureAwait(false);
if (msg.Nonce.IsSpecified && msg.Nonce.Value.HasValue) if (msg.Nonce.IsSpecified && msg.Nonce.Value.HasValue)
ProcessMessage(msg); ProcessMessage(msg);
@@ -220,7 +220,7 @@ namespace Discord.API
byte[] bytes = null; byte[] bytes = null;
var guid = Guid.NewGuid(); var guid = Guid.NewGuid();
payload = new API.Rpc.RpcMessage { Cmd = cmd, Event = evt, Args = payload, Nonce = guid }; payload = new API.Rpc.RpcFrame { Cmd = cmd, Event = evt, Args = payload, Nonce = guid };
if (payload != null) if (payload != null)
{ {
var json = SerializeJson(payload); var json = SerializeJson(payload);
@@ -351,7 +351,7 @@ namespace Discord.API
return await SendRpcAsync<SubscriptionResponse>("UNSUBSCRIBE", msg, evt: evt, options: options).ConfigureAwait(false); return await SendRpcAsync<SubscriptionResponse>("UNSUBSCRIBE", msg, evt: evt, options: options).ConfigureAwait(false);
} }
private bool ProcessMessage(API.Rpc.RpcMessage msg) private bool ProcessMessage(API.Rpc.RpcFrame msg)
{ {
RpcRequest requestTracker; RpcRequest requestTracker;
if (_requests.TryGetValue(msg.Nonce.Value.Value, out requestTracker)) if (_requests.TryGetValue(msg.Nonce.Value.Value, out requestTracker))

2
src/Discord.Net.Rpc/API/Rpc/RpcMessage.cs → src/Discord.Net.Rpc/API/RpcFrame.cs
View File

@@ -4,7 +4,7 @@ using System;
namespace Discord.API.Rpc namespace Discord.API.Rpc
{ {
public class RpcMessage public class RpcFrame
{ {
[JsonProperty("cmd")] [JsonProperty("cmd")]
public string Cmd { get; set; } public string Cmd { get; set; }