From e10263b31a87e18548c3a358274625717f82eb19 Mon Sep 17 00:00:00 2001 From: TopiSenpai Date: Fri, 9 Jul 2021 19:10:28 +0200 Subject: [PATCH] modified permission getter for interaction perms --- api/member.go | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/api/member.go b/api/member.go index 0254e592..6470af9c 100644 --- a/api/member.go +++ b/api/member.go @@ -8,21 +8,24 @@ import ( // Member is a discord GuildMember type Member struct { - Disgo Disgo - GuildID Snowflake `json:"guild_id"` - User *User `json:"user"` - Nick *string `json:"nick"` - RoleIDs []Snowflake `json:"roles,omitempty"` - JoinedAt time.Time `json:"joined_at"` - PremiumSince *time.Time `json:"premium_since,omitempty"` - Deaf *bool `json:"deaf,omitempty"` - Mute *bool `json:"mute,omitempty"` - Pending bool `json:"pending"` - ChannelPermissions *Permissions `json:"permissions,omitempty"` + Disgo Disgo + GuildID Snowflake `json:"guild_id"` + User *User `json:"user"` + Nick *string `json:"nick"` + RoleIDs []Snowflake `json:"roles,omitempty"` + JoinedAt time.Time `json:"joined_at"` + PremiumSince *time.Time `json:"premium_since,omitempty"` + Deaf bool `json:"deaf,omitempty"` + Mute bool `json:"mute,omitempty"` + Pending bool `json:"pending"` + InteractionPermissions *Permissions `json:"permissions,omitempty"` } // Permissions returns the Permissions the Member has in the Guild func (m *Member) Permissions() Permissions { + if m.InteractionPermissions != nil { + return *m.InteractionPermissions + } return GetMemberPermissions(m) }