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

Added handling of opcode-less messages

Browse Source
This commit is contained in:
RogueException
2015-12-25 23:11:55 -04:00
parent 2e34b67250
commit 3d9dadaaae
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net/API/Client/IWebSocketMessage.cs
View File

@@ -11,7 +11,7 @@ namespace Discord.API.Client
public class WebSocketMessage public class WebSocketMessage
{ {
[JsonProperty("op")] [JsonProperty("op")]
public int Operation { get; set; } public int? Operation { get; set; }
[JsonProperty("t", NullValueHandling = NullValueHandling.Ignore)] [JsonProperty("t", NullValueHandling = NullValueHandling.Ignore)]
public string Type { get; set; } public string Type { get; set; }
[JsonProperty("s", NullValueHandling = NullValueHandling.Ignore)] [JsonProperty("s", NullValueHandling = NullValueHandling.Ignore)]

9
src/Discord.Net/Net/WebSockets/GatewaySocket.cs
View File

@@ -77,7 +77,7 @@ namespace Discord.Net.WebSockets
if (msg.Sequence.HasValue) if (msg.Sequence.HasValue)
_lastSequence = msg.Sequence.Value; _lastSequence = msg.Sequence.Value;
var opCode = (OpCodes)msg.Operation; var opCode = (OpCodes?)msg.Operation;
switch (opCode) switch (opCode)
{ {
case OpCodes.Dispatch: case OpCodes.Dispatch:
@@ -111,8 +111,11 @@ namespace Discord.Net.WebSockets
} }
break; break;
default: default:
Logger.Warning($"Unknown Opcode: {opCode}"); if (opCode != null)
break; Logger.Warning($"Unknown Opcode: {opCode}");
else
Logger.Warning($"Received message with no opcode");
break;
} }
} }