various tweaks and api cleanups

Author: jonas747

events.go

@@ -150,6 +150,10 @@ type GuildMemberAdd struct {
 	*Member
 }
 
+func (e *GuildMemberAdd) GetGuildID() int64 {
+	return e.GuildID
+}
+
 // GuildMemberUpdate is the data for a GuildMemberUpdate event.
 type GuildMemberUpdate struct {
 	*Member
@@ -427,5 +431,5 @@ type InviteDelete struct {
 }
 
 type InteractionCreate struct {
-	*Interaction
+	Interaction
 }

restapi.go

@@ -2590,17 +2590,9 @@ func (s *Session) GetOriginalInteractionResponse(applicationID int64, token stri
 	return
 }
 
-type EditWebhookMessageRequest struct {
-	Content         *string          `json:"content,omitempty"`          //	the message contents (up to 2000 characters)
-	Embeds          *[]*MessageEmbed `json:"embeds,omitempty"`           // of up to 10 embed objects	embedded rich content
-	AllowedMentions *AllowedMentions `json:"allowed_mentions,omitempty"` // object	allowed mentions for the message
-	// File	file  `json:"file"` //	the contents of the file being sent/edited
-	// PayloadJson	string  `json:"payload_json"` //	See message create
-}
-
 // Edits the initial Interaction response. Functions the same as Edit Webhook Message.
 // PATCH /webhooks/{application.id}/{interaction.token}/messages/@original
-func (s *Session) EditOriginalInteractionResponse(applicationID int64, token string, data *EditWebhookMessageRequest) (st *Message, err error) {
+func (s *Session) EditOriginalInteractionResponse(applicationID int64, token string, data *WebhookParams) (st *Message, err error) {
 	body, err := s.RequestWithBucketID("PATCH", EndpointInteractionOriginalMessage(applicationID, token), data, EndpointInteractionOriginalMessage(0, ""))
 	if err != nil {
 		return
@@ -2631,7 +2623,7 @@ func (s *Session) CreateFollowupMessage(applicationID int64, token string, data
 
 // EditFollowupMessage Edits a followup message for an Interaction. Functions the same as Edit Webhook Message.
 // PATCH /webhooks/{application.id}/{interaction.token}/messages/{message.id}
-func (s *Session) EditFollowupMessage(applicationID int64, token string, messageID int64, data *EditWebhookMessageRequest) (st *Message, err error) {
+func (s *Session) EditFollowupMessage(applicationID int64, token string, messageID int64, data *WebhookParams) (st *Message, err error) {
 	body, err := s.RequestWithBucketID("PATCH", EndpointInteractionFollowupMessage(applicationID, token, messageID), data, EndpointInteractionFollowupMessage(0, "", 0))
 	if err != nil {
 		return

structs.go

@@ -1212,16 +1212,61 @@ const (
 
 // Interaction is the base "thing" that is sent when a user invokes a command, and is the same for Slash Commands and other future interaction types.
 type Interaction struct {
-	ID            int64                              `json:"id,string"`             // id of the interaction
-	ApplicationID int64                              `json:"application_id,string"` // id of the application this interaction is for
-	Kind          InteractionType                    `json:"type"`                  // the type of interaction
-	Data          *ApplicationCommandInteractionData `json:"data"`                  // the command data payload
-	GuildID       int64                              `json:"guild_id,string"`       // the guild it was sent from
-	ChannelID     int64                              `json:"channel_id,string"`     // the channel it was sent from
-	Member        *Member                            `json:"member"`                // member object	guild member data for the invoking user, including permissions
-	User          *User                              `json:"user"`                  // object	user object for the invoking user, if invoked in a DM
-	Token         string                             `json:"token"`                 // a continuation token for responding to the interaction
-	Version       int                                `json:"version"`               // read-only property, always
+	ID            int64           `json:"id,string"`             // id of the interaction
+	ApplicationID int64           `json:"application_id,string"` // id of the application this interaction is for
+	Kind          InteractionType `json:"type"`                  // the type of interaction
+	GuildID       int64           `json:"guild_id,string"`       // the guild it was sent from
+	ChannelID     int64           `json:"channel_id,string"`     // the channel it was sent from
+	Member        *Member         `json:"member"`                // member object	guild member data for the invoking user, including permissions
+	User          *User           `json:"user"`                  // object	user object for the invoking user, if invoked in a DM
+	Token         string          `json:"token"`                 // a continuation token for responding to the interaction
+	Version       int             `json:"version"`               // read-only property, always
+
+	DataCommand *ApplicationCommandInteractionData
+}
+
+type interactionTemp struct {
+	ID            int64           `json:"id,string"`             // id of the interaction
+	ApplicationID int64           `json:"application_id,string"` // id of the application this interaction is for
+	Kind          InteractionType `json:"type"`                  // the type of interaction
+	Data          json.RawMessage `json:"data"`                  // data payload
+	GuildID       int64           `json:"guild_id,string"`       // the guild it was sent from
+	ChannelID     int64           `json:"channel_id,string"`     // the channel it was sent from
+	Member        *Member         `json:"member"`                // member object	guild member data for the invoking user, including permissions
+	User          *User           `json:"user"`                  // object	user object for the invoking user, if invoked in a DM
+	Token         string          `json:"token"`                 // a continuation token for responding to the interaction
+	Version       int             `json:"version"`               // read-only property, always
+}
+
+// Interaction requires custom unmarshal logic because of the Data field being dependant on the interaction type
+func (a *Interaction) UnmarshalJSON(b []byte) error {
+	var temp *interactionTemp
+	err := json.Unmarshal(b, &temp)
+	if err != nil {
+		return err
+	}
+
+	*a = Interaction{
+		ID:            temp.ID,
+		ApplicationID: temp.ApplicationID,
+		Kind:          temp.Kind,
+		GuildID:       temp.GuildID,
+		ChannelID:     temp.ChannelID,
+		Member:        temp.Member,
+		User:          temp.User,
+		Token:         temp.Token,
+		Version:       temp.Version,
+	}
+
+	switch temp.Kind {
+	case InteractionTypeApplicationCommand:
+		err = json.Unmarshal(temp.Data, &a.DataCommand)
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
 }
 
 type InteractionType int