Merge branch 'master' into refactor/oauth-params

_examples/handler/example.go

@@ -80,7 +80,7 @@ func main() {
 		r.Use(middleware.Print("group2"))
 		r.Command("/ping", handlePing)
 		r.Command("/ping2", handleContent("pong2"))
-		r.Component("button1/{data}", handleComponent)
+		r.Component("/button1/{data}", handleComponent)
 	})
 	r.NotFound(handleNotFound)
 
@@ -126,7 +126,7 @@ func handlePing(event *handler.CommandEvent) error {
 		Content: "pong",
 		Components: []discord.ContainerComponent{
 			discord.ActionRowComponent{
-				discord.NewPrimaryButton("button1", "button1/testData"),
+				discord.NewPrimaryButton("button1", "/button1/testData"),
 			},
 		},
 	})

discord/application.go

@@ -275,5 +275,5 @@ const (
 type ApplicationIntegrationTypesConfig map[ApplicationIntegrationType]ApplicationIntegrationTypeConfiguration
 
 type ApplicationIntegrationTypeConfiguration struct {
-	OAuth2InstallParams InstallParams `json:"oauth2_install_params"`
+	OAuth2InstallParams *InstallParams `json:"oauth2_install_params"`
 }

discord/ban.go

@@ -1,5 +1,7 @@
 package discord
 
+import "github.com/disgoorg/snowflake/v2"
+
 // Ban represents a banned User from a Guild (https://discord.com/developers/docs/resources/guild#ban-object)
 type Ban struct {
 	Reason *string `json:"reason,omitempty"`
@@ -10,3 +12,15 @@ type Ban struct {
 type AddBan struct {
 	DeleteMessageSeconds int `json:"delete_message_seconds,omitempty"`
 }
+
+// BulkBan is used to bulk ban Users
+type BulkBan struct {
+	UserIDs              []snowflake.ID `json:"user_ids"`
+	DeleteMessageSeconds int            `json:"delete_message_seconds,omitempty"`
+}
+
+// BulkBanResult is the result of a BulkBan request
+type BulkBanResult struct {
+	BannedUsers []snowflake.ID `json:"banned_users"`
+	FailedUsers []snowflake.ID `json:"failed_users"`
+}

discord/cdn_endpoints.go

@@ -24,7 +24,7 @@ var (
 
 	MemberAvatar = NewCDN("/guilds/{guild.id}/users/{user.id}/avatars/{member.avatar.hash}", FileFormatPNG, FileFormatJPEG, FileFormatWebP, FileFormatGIF)
 
-	UserAvatarDecoration = NewCDN("/avatar-decorations/{user.id}/{user.avatar.decoration.hash}", FileFormatPNG)
+	AvatarDecoration = NewCDN("/avatar-decoration-presets/{user.avatar.decoration.hash}", FileFormatPNG)
 
 	ApplicationIcon  = NewCDN("/app-icons/{application.id}/{icon.hash}", FileFormatPNG, FileFormatJPEG, FileFormatWebP)
 	ApplicationCover = NewCDN("/app-assets/{application.id}/{cover.image.hash}", FileFormatPNG, FileFormatJPEG, FileFormatWebP)

discord/connection.go

@@ -16,6 +16,7 @@ type ConnectionType string
 
 const (
 	ConnectionTypeBattleNet          ConnectionType = "battlenet"
+	ConnectionTypeBungie             ConnectionType = "bungie"
 	ConnectionTypeEbay               ConnectionType = "ebay"
 	ConnectionTypeEpicGames          ConnectionType = "epicgames"
 	ConnectionTypeFacebook           ConnectionType = "facebook"

discord/interaction.go

@@ -45,7 +45,7 @@ type rawInteraction struct {
 	AppPermissions               *Permissions                                `json:"app_permissions,omitempty"`
 	Entitlements                 []Entitlement                               `json:"entitlements"`
 	AuthorizingIntegrationOwners map[ApplicationIntegrationType]snowflake.ID `json:"authorizing_integration_owners"`
-	Context                      *InteractionContextType                     `json:"context"`
+	Context                      InteractionContextType                      `json:"context"`
 }
 
 // Interaction is used for easier unmarshalling of different Interaction(s)
@@ -66,7 +66,7 @@ type Interaction interface {
 	AppPermissions() *Permissions
 	Entitlements() []Entitlement
 	AuthorizingIntegrationOwners() map[ApplicationIntegrationType]snowflake.ID
-	Context() *InteractionContextType
+	Context() InteractionContextType
 	CreatedAt() time.Time
 
 	interaction()

discord/interaction_base.go

@@ -21,7 +21,7 @@ type baseInteraction struct {
 	appPermissions               *Permissions
 	entitlements                 []Entitlement
 	authorizingIntegrationOwners map[ApplicationIntegrationType]snowflake.ID
-	context                      *InteractionContextType
+	context                      InteractionContextType
 }
 
 func (i baseInteraction) ID() snowflake.ID {
@@ -75,7 +75,7 @@ func (i baseInteraction) AuthorizingIntegrationOwners() map[ApplicationIntegrati
 	return i.authorizingIntegrationOwners
 }
 
-func (i baseInteraction) Context() *InteractionContextType {
+func (i baseInteraction) Context() InteractionContextType {
 	return i.context
 }
 

discord/interaction_ping.go

@@ -104,8 +104,8 @@ func (PingInteraction) AuthorizingIntegrationOwners() map[ApplicationIntegration
 	return nil
 }
 
-func (PingInteraction) Context() *InteractionContextType {
-	return nil
+func (PingInteraction) Context() InteractionContextType {
+	return 0
 }
 
 func (PingInteraction) interaction() {}

discord/member.go

@@ -13,17 +13,18 @@ var _ Mentionable = (*Member)(nil)
 
 // Member is a discord GuildMember
 type Member struct {
-	User                       User           `json:"user"`
-	Nick                       *string        `json:"nick"`
-	Avatar                     *string        `json:"avatar"`
-	RoleIDs                    []snowflake.ID `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"`
-	Flags                      MemberFlags    `json:"flags"`
-	Pending                    bool           `json:"pending"`
-	CommunicationDisabledUntil *time.Time     `json:"communication_disabled_until"`
+	User                       User                  `json:"user"`
+	Nick                       *string               `json:"nick"`
+	Avatar                     *string               `json:"avatar"`
+	RoleIDs                    []snowflake.ID        `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"`
+	Flags                      MemberFlags           `json:"flags"`
+	Pending                    bool                  `json:"pending"`
+	CommunicationDisabledUntil *time.Time            `json:"communication_disabled_until"`
+	AvatarDecorationData       *AvatarDecorationData `json:"avatar_decoration_data"`
 
 	// This field is not present everywhere in the API and often populated by disgo
 	GuildID snowflake.ID `json:"guild_id"`
@@ -67,6 +68,15 @@ func (m Member) AvatarURL(opts ...CDNOpt) *string {
 	return &url
 }
 
+// AvatarDecorationURL returns the avatar decoration URL if set or nil
+func (m Member) AvatarDecorationURL(opts ...CDNOpt) *string {
+	if m.AvatarDecorationData == nil {
+		return nil
+	}
+	url := formatAssetURL(AvatarDecoration, opts, m.AvatarDecorationData.Asset)
+	return &url
+}
+
 func (m Member) CreatedAt() time.Time {
 	return m.User.CreatedAt()
 }

discord/user.go

@@ -65,17 +65,17 @@ var _ Mentionable = (*User)(nil)
 
 // User is a struct for interacting with discord's users
 type User struct {
-	ID               snowflake.ID `json:"id"`
-	Username         string       `json:"username"`
-	Discriminator    string       `json:"discriminator"`
-	GlobalName       *string      `json:"global_name"`
-	Avatar           *string      `json:"avatar"`
-	Banner           *string      `json:"banner"`
-	AccentColor      *int         `json:"accent_color"`
-	Bot              bool         `json:"bot"`
-	System           bool         `json:"system"`
-	PublicFlags      UserFlags    `json:"public_flags"`
-	AvatarDecoration *string      `json:"avatar_decoration"`
+	ID                   snowflake.ID          `json:"id"`
+	Username             string                `json:"username"`
+	Discriminator        string                `json:"discriminator"`
+	GlobalName           *string               `json:"global_name"`
+	Avatar               *string               `json:"avatar"`
+	Banner               *string               `json:"banner"`
+	AccentColor          *int                  `json:"accent_color"`
+	Bot                  bool                  `json:"bot"`
+	System               bool                  `json:"system"`
+	PublicFlags          UserFlags             `json:"public_flags"`
+	AvatarDecorationData *AvatarDecorationData `json:"avatar_decoration_data"`
 }
 
 // String returns a mention of the user
@@ -145,10 +145,10 @@ func (u User) BannerURL(opts ...CDNOpt) *string {
 
 // AvatarDecorationURL returns the avatar decoration URL if set or nil
 func (u User) AvatarDecorationURL(opts ...CDNOpt) *string {
-	if u.AvatarDecoration == nil {
+	if u.AvatarDecorationData == nil {
 		return nil
 	}
-	url := formatAssetURL(UserAvatarDecoration, opts, u.ID, *u.AvatarDecoration)
+	url := formatAssetURL(AvatarDecoration, opts, u.AvatarDecorationData.Asset)
 	return &url
 }
 
@@ -198,3 +198,8 @@ type ApplicationRoleConnectionUpdate struct {
 	PlatformUsername *string            `json:"platform_username,omitempty"`
 	Metadata         *map[string]string `json:"metadata,omitempty"`
 }
+
+type AvatarDecorationData struct {
+	Asset string       `json:"asset"`
+	SkuID snowflake.ID `json:"sku_id"`
+}

gateway/gateway_impl.go

@@ -42,10 +42,10 @@ type gatewayImpl struct {
 	closeHandlerFunc CloseHandlerFunc
 	token            string
 
-	conn          *websocket.Conn
-	connMu        sync.Mutex
-	heartbeatChan chan struct{}
-	status        Status
+	conn            *websocket.Conn
+	connMu          sync.Mutex
+	heartbeatCancel context.CancelFunc
+	status          Status
 
 	heartbeatInterval     time.Duration
 	lastHeartbeatSent     time.Time
@@ -132,9 +132,9 @@ func (g *gatewayImpl) Close(ctx context.Context) {
 }
 
 func (g *gatewayImpl) CloseWithCode(ctx context.Context, code int, message string) {
-	if g.heartbeatChan != nil {
+	if g.heartbeatCancel != nil {
 		g.config.Logger.Debug("closing heartbeat goroutines...")
-		g.heartbeatChan <- struct{}{}
+		g.heartbeatCancel()
 	}
 
 	g.connMu.Lock()
@@ -234,16 +234,16 @@ func (g *gatewayImpl) reconnect() {
 }
 
 func (g *gatewayImpl) heartbeat() {
-	if g.heartbeatChan == nil {
-		g.heartbeatChan = make(chan struct{})
-	}
+	ctx, cancel := context.WithCancel(context.Background())
+	g.heartbeatCancel = cancel
+
 	heartbeatTicker := time.NewTicker(g.heartbeatInterval)
 	defer heartbeatTicker.Stop()
 	defer g.config.Logger.Debug("exiting heartbeat goroutine")
 
 	for {
 		select {
-		case <-g.heartbeatChan:
+		case <-ctx.Done():
 			return
 
 		case <-heartbeatTicker.C:

handlers/message_reaction_handler.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"github.com/disgoorg/disgo/bot"
+	"github.com/disgoorg/disgo/discord"
 	"github.com/disgoorg/disgo/events"
 	"github.com/disgoorg/disgo/gateway"
 )
@@ -37,6 +38,11 @@ func gatewayHandlerMessageReactionAdd(client bot.Client, sequenceNumber int, sha
 			MessageAuthorID: event.MessageAuthorID,
 		})
 	} else {
+		var member discord.Member
+		// sometimes the member is nil for some reason
+		if event.Member != nil {
+			member = *event.Member
+		}
 		client.EventManager().DispatchEvent(&events.GuildMessageReactionAdd{
 			GenericGuildMessageReaction: &events.GenericGuildMessageReaction{
 				GenericEvent: genericEvent,
@@ -48,7 +54,7 @@ func gatewayHandlerMessageReactionAdd(client bot.Client, sequenceNumber int, sha
 				BurstColors:  event.BurstColors,
 				Burst:        event.Burst,
 			},
-			Member:          *event.Member,
+			Member:          member,
 			MessageAuthorID: event.MessageAuthorID,
 		})
 	}

rest/guilds.go

@@ -40,6 +40,7 @@ type Guilds interface {
 	GetBan(guildID snowflake.ID, userID snowflake.ID, opts ...RequestOpt) (*discord.Ban, error)
 	AddBan(guildID snowflake.ID, userID snowflake.ID, deleteMessageDuration time.Duration, opts ...RequestOpt) error
 	DeleteBan(guildID snowflake.ID, userID snowflake.ID, opts ...RequestOpt) error
+	BulkBan(guildID snowflake.ID, ban discord.BulkBan, opts ...RequestOpt) (*discord.BulkBanResult, error)
 
 	GetIntegrations(guildID snowflake.ID, opts ...RequestOpt) ([]discord.Integration, error)
 	DeleteIntegration(guildID snowflake.ID, integrationID snowflake.ID, opts ...RequestOpt) error
@@ -210,6 +211,11 @@ func (s *guildImpl) DeleteBan(guildID snowflake.ID, userID snowflake.ID, opts ..
 	return s.client.Do(DeleteBan.Compile(nil, guildID, userID), nil, nil, opts...)
 }
 
+func (s *guildImpl) BulkBan(guildID snowflake.ID, ban discord.BulkBan, opts ...RequestOpt) (result *discord.BulkBanResult, err error) {
+	err = s.client.Do(BulkBan.Compile(nil, guildID), ban, &result, opts...)
+	return
+}
+
 func (s *guildImpl) GetIntegrations(guildID snowflake.ID, opts ...RequestOpt) (integrations []discord.Integration, err error) {
 	err = s.client.Do(GetIntegrations.Compile(nil, guildID), nil, &integrations, opts...)
 	return

rest/rest_endpoints.go

@@ -65,6 +65,7 @@ var (
 	GetBan    = NewEndpoint(http.MethodGet, "/guilds/{guild.id}/bans/{user.id}")
 	AddBan    = NewEndpoint(http.MethodPut, "/guilds/{guild.id}/bans/{user.id}")
 	DeleteBan = NewEndpoint(http.MethodDelete, "/guilds/{guild.id}/bans/{user.id}")
+	BulkBan   = NewEndpoint(http.MethodPost, "/guilds/{guild.id}/bulk-ban")
 
 	GetMember        = NewEndpoint(http.MethodGet, "/guilds/{guild.id}/members/{user.id}")
 	GetMembers       = NewEndpoint(http.MethodGet, "/guilds/{guild.id}/members")