From 5ef835fc80f38d9a51e404ac017b51ef3a63cf16 Mon Sep 17 00:00:00 2001 From: Chris Rhodes Date: Thu, 3 Nov 2016 22:39:55 -0700 Subject: [PATCH] Fix GuildBans. Fixes #263 --- events.go | 6 ++++-- restapi.go | 2 +- structs.go | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/events.go b/events.go index c5404ec..1e62505 100644 --- a/events.go +++ b/events.go @@ -118,12 +118,14 @@ type GuildDelete struct { // GuildBanAdd is a wrapper struct for an event. type GuildBanAdd struct { - *GuildBan + *User + GuildID string `json:"guild_id"` } // GuildBanRemove is a wrapper struct for an event. type GuildBanRemove struct { - *GuildBan + *User + GuildID string `json:"guild_id"` } // GuildMemberAdd is a wrapper struct for an event. diff --git a/restapi.go b/restapi.go index 1d5515c..e570627 100644 --- a/restapi.go +++ b/restapi.go @@ -604,7 +604,7 @@ func (s *Session) GuildLeave(guildID string) (err error) { // GuildBans returns an array of User structures for all bans of a // given guild. // guildID : The ID of a Guild. -func (s *Session) GuildBans(guildID string) (st []*User, err error) { +func (s *Session) GuildBans(guildID string) (st []*GuildBan, err error) { body, err := s.Request("GET", EndpointGuildBans(guildID), nil) if err != nil { diff --git a/structs.go b/structs.go index 707b2b7..a1b0d5e 100644 --- a/structs.go +++ b/structs.go @@ -444,8 +444,8 @@ type GuildRoleDelete struct { // A GuildBan stores data for a guild ban. type GuildBan struct { - User *User `json:"user"` - GuildID string `json:"guild_id"` + Reason string `json:"reason"` + User *User `json:"user"` } // A GuildEmojisUpdate stores data for a guild emoji update event.