v8 & v9 stuff

components.go

@@ -9,8 +9,9 @@ type ComponentType uint
 
 // MessageComponent types.
 const (
-	ActionsRowComponent ComponentType = 1
-	ButtonComponent     ComponentType = 2
+	ComponentActionRow  ComponentType = 1
+	ComponentButton     ComponentType = 2
+	ComponentSelectMenu ComponentType = 3
 )
 
 // MessageComponent is a base interface for all message components.
@@ -35,14 +36,18 @@ func (umc *unmarshalableMessageComponent) UnmarshalJSON(src []byte) error {
 
 	var data MessageComponent
 	switch v.Type {
-	case ActionsRowComponent:
+	case ComponentActionRow:
 		v := ActionsRow{}
 		err = json.Unmarshal(src, &v)
 		data = v
-	case ButtonComponent:
+	case ComponentButton:
 		v := Button{}
 		err = json.Unmarshal(src, &v)
 		data = v
+	case ComponentSelectMenu:
+		v := SelectMenu{}
+		err = json.Unmarshal(src, &v)
+		data = v
 	}
 	if err != nil {
 		return err
@@ -87,41 +92,41 @@ func (r *ActionsRow) UnmarshalJSON(data []byte) error {
 
 // Type is a method to get the type of a component.
 func (r ActionsRow) Type() ComponentType {
-	return ActionsRowComponent
+	return ComponentActionRow
 }
 
 // ButtonStyle is style of button.
 type ButtonStyle uint
 
 // Button styles.
 const (
-	// PrimaryButton is a button with blurple color.
-	PrimaryButton ButtonStyle = 1
-	// SecondaryButton is a button with grey color.
-	SecondaryButton ButtonStyle = 2
-	// SuccessButton is a button with green color.
-	SuccessButton ButtonStyle = 3
-	// DangerButton is a button with red color.
-	DangerButton ButtonStyle = 4
-	// LinkButton is a special type of button which navigates to a URL. Has grey color.
-	LinkButton ButtonStyle = 5
+	// ButtonPrimary is a button with blurple color.
+	ButtonPrimary ButtonStyle = 1
+	// ButtonSecondary is a button with grey color.
+	ButtonSecondary ButtonStyle = 2
+	// ButtonSuccess is a button with green color.
+	ButtonSuccess ButtonStyle = 3
+	// ButtonDanger is a button with red color.
+	ButtonDanger ButtonStyle = 4
+	// ButtonLink is a special type of button which navigates to a URL. Has grey color.
+	ButtonLink ButtonStyle = 5
 )
 
-// ButtonEmoji represents button emoji, if it does have one.
-type ButtonEmoji struct {
+// ComponentEmoji represents a component's emoji, if it has one.
+type ComponentEmoji struct {
 	Name     string `json:"name,omitempty"`
 	ID       string `json:"id,omitempty"`
 	Animated bool   `json:"animated,omitempty"`
 }
 
 // Button represents button component.
 type Button struct {
-	Label    string      `json:"label"`
-	Style    ButtonStyle `json:"style"`
-	Disabled bool        `json:"disabled"`
-	Emoji    ButtonEmoji `json:"emoji"`
+	Label    string         `json:"label"`
+	Style    ButtonStyle    `json:"style"`
+	Disabled bool           `json:"disabled"`
+	Emoji    ComponentEmoji `json:"emoji"`
 
-	// NOTE: Only button with LinkButton style can have link. Also, URL is mutually exclusive with CustomID.
+	// NOTE: Only button with ButtonLink style can have link. Also, URL is mutually exclusive with CustomID.
 	URL      string `json:"url,omitempty"`
 	CustomID string `json:"custom_id,omitempty"`
 }
@@ -131,7 +136,7 @@ func (b Button) MarshalJSON() ([]byte, error) {
 	type button Button
 
 	if b.Style == 0 {
-		b.Style = PrimaryButton
+		b.Style = ButtonPrimary
 	}
 
 	return json.Marshal(struct {
@@ -145,5 +150,42 @@ func (b Button) MarshalJSON() ([]byte, error) {
 
 // Type is a method to get the type of a component.
 func (b Button) Type() ComponentType {
-	return ButtonComponent
+	return ComponentButton
+}
+
+// SelectMenu is the select menu component.
+type SelectMenu struct {
+	CustomID    string         `json:"custom_id"`
+	Options     []SelectOption `json:"options"`
+	Placeholder string         `json:"placeholder,omitempty"`
+	MinValues   int            `json:"min_values,omitempty"`
+	MaxValues   int            `json:"max_values,omitempty"`
+	Disabled    bool           `json:"disabled"`
+}
+
+// SelectOption is a choice on the SelectMenu component.
+type SelectOption struct {
+	Label       string         `json:"label"`
+	Value       string         `json:"value"`
+	Description string         `json:"description,omitempty"`
+	Emoji       ComponentEmoji `json:"emoji,omitempty"`
+	Default     bool           `json:"default,omitempty"`
+}
+
+// MarshalJSON is a method for marshaling SelectMenu to a JSON object.
+func (b SelectMenu) MarshalJSON() ([]byte, error) {
+	type selectMenu SelectMenu
+
+	return json.Marshal(struct {
+		selectMenu
+		Type ComponentType `json:"type"`
+	}{
+		selectMenu: selectMenu(b),
+		Type:       b.Type(),
+	})
+}
+
+// Type is a method to get the type of a component.
+func (b SelectMenu) Type() ComponentType {
+	return ComponentSelectMenu
 }

endpoints.go

@@ -14,7 +14,7 @@ package discordgo
 import "strconv"
 
 // APIVersion is the Discord API version used for the REST and Websocket API.
-var APIVersion = "8"
+var APIVersion = "9"
 
 // Known Discord API Endpoints.
 var (
@@ -23,14 +23,16 @@ var (
 	EndpointSmActive   = EndpointSm + "active.json"
 	EndpointSmUpcoming = EndpointSm + "upcoming.json"
 
-	EndpointDiscord    = "https://discord.com/"
-	EndpointAPI        = EndpointDiscord + "api/v" + APIVersion + "/"
-	EndpointGuilds     = EndpointAPI + "guilds/"
-	EndpointChannels   = EndpointAPI + "channels/"
-	EndpointUsers      = EndpointAPI + "users/"
-	EndpointGateway    = EndpointAPI + "gateway"
-	EndpointGatewayBot = EndpointGateway + "/bot"
-	EndpointWebhooks   = EndpointAPI + "webhooks/"
+	EndpointDiscord        = "https://discord.com/"
+	EndpointAPI            = EndpointDiscord + "api/v" + APIVersion + "/"
+	EndpointGuilds         = EndpointAPI + "guilds/"
+	EndpointChannels       = EndpointAPI + "channels/"
+	EndpointUsers          = EndpointAPI + "users/"
+	EndpointGateway        = EndpointAPI + "gateway"
+	EndpointGatewayBot     = EndpointGateway + "/bot"
+	EndpointWebhooks       = EndpointAPI + "webhooks/"
+	EndpointStickers       = EndpointAPI + "stickers/"
+	EndpointStageInstances = EndpointAPI + "stage-instances/"
 
 	EndpointCDN             = "https://cdn.discordapp.com/"
 	EndpointCDNAttachments  = EndpointCDN + "attachments/"
@@ -102,6 +104,8 @@ var (
 	EndpointGuildEmojis          = func(gID string) string { return EndpointGuilds + gID + "/emojis" }
 	EndpointGuildEmoji           = func(gID, eID string) string { return EndpointGuilds + gID + "/emojis/" + eID }
 	EndpointGuildBanner          = func(gID, hash string) string { return EndpointCDNBanners + gID + "/" + hash + ".png" }
+	EndpointGuildStickers        = func(gID string) string { return EndpointGuilds + gID + "/stickers" }
+	EndpointGuildSticker         = func(gID, sID string) string { return EndpointGuilds + gID + "/stickers/" + sID }
 
 	EndpointChannel                   = func(cID string) string { return EndpointChannels + cID }
 	EndpointChannelPermissions        = func(cID string) string { return EndpointChannels + cID + "/permissions" }
@@ -117,8 +121,23 @@ var (
 	EndpointChannelMessageCrosspost   = func(cID, mID string) string { return EndpointChannel(cID) + "/messages/" + mID + "/crosspost" }
 	EndpointChannelFollow             = func(cID string) string { return EndpointChannel(cID) + "/followers" }
 
+	EndpointChannelStartThreadWithMessage           = func(cID string, mID string) string { return EndpointChannels + cID + "/messages/" + mID + "/threads" }
+	EndpointChannelStartThreadWithoutMessage        = func(cID string) string { return EndpointChannels + cID + "/threads" }
+	EndpointChannelThread                           = func(cID string) string { return EndpointChannels + cID + "/thread-members/@me" }
+	EndpointChannelMember                           = func(cID string, uID string) string { return EndpointChannels + cID + "/thread-members/" + uID }
+	EndpointChannelListMembers                      = func(cID string) string { return EndpointChannels + cID + "/thread-members" }
+	EndpointChannelListActiveThreads                = func(cID string) string { return EndpointChannels + cID + "/threads/active" }
+	EndpointChannelListPublicArchivedThreads        = func(cID string) string { return EndpointChannels + cID + "/threads/archived/public" }
+	EndpointChannelListPrivateArchivedThreads       = func(cID string) string { return EndpointChannels + cID + "/threads/archived/private" }
+	EndpointChannelListJoinedPrivateArchivedThreads = func(cID string) string { return EndpointChannels + cID + "/users/@me/threads/archived/private" }
+
 	EndpointGroupIcon = func(cID, hash string) string { return EndpointCDNChannelIcons + cID + "/" + hash + ".png" }
 
+	EndpointSticker           = func(sID string) string { return EndpointStickers + sID }
+	EndpointNitroStickerPacks = EndpointAPI + "/sticker-packs"
+
+	EndpointStageInstance = func(cID string) string { return EndpointStageInstances + cID }
+
 	EndpointChannelWebhooks = func(cID string) string { return EndpointChannel(cID) + "/webhooks" }
 	EndpointWebhook         = func(wID string) string { return EndpointWebhooks + wID }
 	EndpointWebhookToken    = func(wID, token string) string { return EndpointWebhooks + wID + "/" + token }