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

Fixed JoinedServer event not being raised

Browse Source
This commit is contained in:
RogueException
2015-11-24 02:49:13 -04:00
parent 05991f4c4b
commit 704e0c9523
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net/API/Servers.cs
View File

@@ -52,7 +52,7 @@ namespace Discord.API
[JsonProperty("voice_states")] [JsonProperty("voice_states")]
public VoiceMemberInfo[] VoiceStates; public VoiceMemberInfo[] VoiceStates;
[JsonProperty("unavailable")] [JsonProperty("unavailable")]
public bool Unavailable; public bool? Unavailable;
} }
//Create //Create

17
src/Discord.Net/DiscordClient.cs
View File

@@ -317,7 +317,7 @@ namespace Discord
_privateUser.GlobalUser.Update(data.User); _privateUser.GlobalUser.Update(data.User);
foreach (var model in data.Guilds) foreach (var model in data.Guilds)
{ {
if (!model.Unavailable) if (model.Unavailable != true)
{ {
var server = _servers.GetOrAdd(model.Id); var server = _servers.GetOrAdd(model.Id);
server.Update(model); server.Update(model);
@@ -337,15 +337,12 @@ namespace Discord
case "GUILD_CREATE": case "GUILD_CREATE":
{ {
var data = e.Payload.ToObject<GuildCreateEvent>(_serializer); var data = e.Payload.ToObject<GuildCreateEvent>(_serializer);
if (!data.Unavailable) var server = _servers.GetOrAdd(data.Id);
{ server.Update(data);
var server = _servers.GetOrAdd(data.Id); if (data.Unavailable == false)
server.Update(data); RaiseServerAvailable(server);
if (data.Unavailable == false) else
RaiseServerAvailable(server); RaiseJoinedServer(server);
else
RaiseJoinedServer(server);
}
} }
break; break;
case "GUILD_UPDATE": case "GUILD_UPDATE":