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

Merge branch 'master' of https://github.com/RogueException/Discord.Net.git

Browse Source
This commit is contained in:
RogueException
2015-09-23 16:23:22 -03:00
parent 11cb82e094 539d8eff74
commit 26cafdbcd1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net/Net/WebSockets/Commands.cs
View File

@@ -26,7 +26,7 @@ namespace Discord.Net.WebSockets
[JsonProperty(PropertyName = "token")] [JsonProperty(PropertyName = "token")]
public string Token; public string Token;
[JsonProperty(PropertyName = "v")] [JsonProperty(PropertyName = "v")]
public int Version = 2; public int Version = 3;
[JsonProperty(PropertyName = "properties")] [JsonProperty(PropertyName = "properties")]
public Dictionary<string, string> Properties = new Dictionary<string, string>(); public Dictionary<string, string> Properties = new Dictionary<string, string>();
} }

3
src/Discord.Net/Net/WebSockets/WebSocket.BuiltIn.cs
View File

@@ -85,7 +85,8 @@ namespace Discord.Net.WebSockets
} }
if (result.MessageType == WebSocketMessageType.Close) if (result.MessageType == WebSocketMessageType.Close)
throw new Exception($"Got Close Message ({result.CloseStatus?.ToString() ?? "Unexpected"}): {result.CloseStatusDescription ?? "No Reason"}"); throw new Exception($"Got Close Message ({result.CloseStatus?.ToString() ?? "Unexpected"}): " +
result.CloseStatusDescription != "" ? result.CloseStatusDescription : "No Reason");
else else
builder.Append(Encoding.UTF8.GetString(buffer.Array, buffer.Offset, result.Count)); builder.Append(Encoding.UTF8.GetString(buffer.Array, buffer.Offset, result.Count));