From c8f9372113cebae1d0c26435867d08e90775bcea Mon Sep 17 00:00:00 2001 From: RogueException Date: Mon, 20 Jun 2016 17:00:15 -0300 Subject: [PATCH] Fixed ban event deserialization --- src/Discord.Net/API/Gateway/GuildBanEvent.cs | 4 +++- src/Discord.Net/DiscordSocketClient.cs | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Discord.Net/API/Gateway/GuildBanEvent.cs b/src/Discord.Net/API/Gateway/GuildBanEvent.cs index 4d55d3c2a..5ad7534a2 100644 --- a/src/Discord.Net/API/Gateway/GuildBanEvent.cs +++ b/src/Discord.Net/API/Gateway/GuildBanEvent.cs @@ -2,9 +2,11 @@ namespace Discord.API.Gateway { - public class GuildBanEvent : User + public class GuildBanEvent { [JsonProperty("guild_id")] public ulong GuildId { get; set; } + [JsonProperty("user")] + public User User { get; set; } } } diff --git a/src/Discord.Net/DiscordSocketClient.cs b/src/Discord.Net/DiscordSocketClient.cs index a4789c1bc..443ba0890 100644 --- a/src/Discord.Net/DiscordSocketClient.cs +++ b/src/Discord.Net/DiscordSocketClient.cs @@ -831,7 +831,7 @@ namespace Discord var data = (payload as JToken).ToObject(_serializer); var guild = DataStore.GetGuild(data.GuildId); if (guild != null) - await UserBanned.RaiseAsync(new User(data)).ConfigureAwait(false); + await UserBanned.RaiseAsync(new User(data.User)).ConfigureAwait(false); else { await _gatewayLogger.WarningAsync("GUILD_BAN_ADD referenced an unknown guild.").ConfigureAwait(false); @@ -846,7 +846,7 @@ namespace Discord var data = (payload as JToken).ToObject(_serializer); var guild = DataStore.GetGuild(data.GuildId); if (guild != null) - await UserUnbanned.RaiseAsync(new User(data)).ConfigureAwait(false); + await UserUnbanned.RaiseAsync(new User(data.User)).ConfigureAwait(false); else { await _gatewayLogger.WarningAsync("GUILD_BAN_REMOVE referenced an unknown guild.").ConfigureAwait(false);