Merge pull request #8 from botlabs-gg/update-discordgo-version

Update discordgo version and move Pending to MemberFields

go.mod

@@ -3,7 +3,7 @@ module github.com/jonas747/dstate/v4
 go 1.13
 
 require (
-	github.com/jonas747/discordgo/v2 v2.0.6
+	github.com/jonas747/discordgo/v2 v2.0.8
 	golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e // indirect
 	golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e // indirect
 )

go.sum

@@ -57,8 +57,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpg
 github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
-github.com/jonas747/discordgo/v2 v2.0.6 h1:tP8ivxLPvpASfKxn7Y/wVnpCwA2XHcObv2jJOjjEPCc=
-github.com/jonas747/discordgo/v2 v2.0.6/go.mod h1:xmbc+LSRXpPe4/tS311/b+wW54chZ5VWct5Z859dhnk=
+github.com/jonas747/discordgo/v2 v2.0.8 h1:9Sek0e2BOZx2PyqWUlmpg342oB3fWY2itQZS7G4xL1A=
+github.com/jonas747/discordgo/v2 v2.0.8/go.mod h1:xmbc+LSRXpPe4/tS311/b+wW54chZ5VWct5Z859dhnk=
 github.com/jonas747/gojay v0.0.0-20190906102056-b3bd5c8fcd50 h1:wsd5JxAZeqlRlj2tWklZmlWB7ojU7ksPR2X0rk4VzWI=
 github.com/jonas747/gojay v0.0.0-20190906102056-b3bd5c8fcd50/go.mod h1:e5tzLnqryDTnlHxS8vbZRvoMiO851Qb02WY2EoC6Dzs=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=

interface.go

@@ -234,14 +234,14 @@ type MemberState struct {
 	// These are not always available and all usages should be checked
 	Member   *MemberFields
 	Presence *PresenceFields
-	Pending  bool
 }
 
 type MemberFields struct {
 	JoinedAt discordgo.Timestamp
 	Roles    []int64
 	Nick     string
 	Avatar   string
+	Pending  bool
 }
 
 type PresenceStatus int32
@@ -285,8 +285,8 @@ func MemberStateFromMember(member *discordgo.Member) *MemberState {
 			Roles:    member.Roles,
 			Nick:     member.Nick,
 			Avatar:   member.Avatar,
+			Pending:  member.Pending,
 		},
-		Pending:  member.Pending,
 		Presence: nil,
 	}
 }
@@ -305,7 +305,7 @@ func (ms *MemberState) DgoMember() *discordgo.Member {
 		Avatar:   ms.Member.Avatar,
 		Roles:    ms.Member.Roles,
 		User:     &ms.User,
-		Pending:  ms.Pending,
+		Pending:  ms.Member.Pending,
 	}
 
 	if ms.Member != nil {