Modals fully working

goscord/discord/interaction.go

@@ -323,27 +323,32 @@ func (ModalSubmitData) Type() InteractionType {
 }
 
 func (d *ModalSubmitData) UnmarshalJSON(data []byte) error {
-	type modalSubmitData ModalSubmitData
-
 	var v struct {
-		modalSubmitData
-		Components []unmarshalableMessageComponent `json:"components"`
+		CustomId   string          `json:"custom_id"`
+		Components json.RawMessage `json:"components"`
 	}
 
 	err := sonic.Unmarshal(data, &v)
 	if err != nil {
 		return err
 	}
 
-	*d = ModalSubmitData(v.modalSubmitData)
+	d.CustomId = v.CustomId
 
-	d.Components = make([]MessageComponent, len(v.Components))
+	var tmp []unmarshalableMessageComponent
 
-	for i, v := range v.Components {
+	err = sonic.Unmarshal(v.Components, &tmp)
+	if err != nil {
+		return err
+	}
+
+	d.Components = make([]MessageComponent, len(tmp))
+
+	for i, v := range tmp {
 		d.Components[i] = v.MessageComponent
 	}
 
-	return err
+	return nil
 }
 
 type ResolvedData struct {

goscord/discord/message_components.go

@@ -3,6 +3,7 @@ package discord
 import (
 	"encoding/json"
 	"fmt"
+
 	"github.com/bytedance/sonic"
 )
 
@@ -54,18 +55,14 @@ func (u *unmarshalableMessageComponent) UnmarshalJSON(data []byte) error {
 	switch v.Type {
 	case ComponentTypeActionRow:
 		u.MessageComponent = &ActionRows{}
-
 	case ComponentTypeButton:
 		u.MessageComponent = &Button{}
-
 	case ComponentTypeSelectMenu:
 		u.MessageComponent = &SelectMenu{}
-
 	case ComponentTypeTextInput:
 		u.MessageComponent = &TextInput{}
-
 	default:
-		return fmt.Errorf("unknown component type: %d", v.Type)
+		return fmt.Errorf("unknown component type %d", v.Type)
 	}
 
 	return sonic.Unmarshal(data, u.MessageComponent)
@@ -88,23 +85,23 @@ func (r ActionRows) MarshalJSON() ([]byte, error) {
 	})
 }
 
-func (r ActionRows) UnmarshalJSON(data []byte) error {
+func (r *ActionRows) UnmarshalJSON(data []byte) error {
 	var v struct {
 		Components []unmarshalableMessageComponent `json:"components"`
 	}
 
 	err := sonic.Unmarshal(data, &v)
+
 	if err != nil {
 		return err
 	}
 
 	r.Components = make([]MessageComponent, len(v.Components))
-
-	for i, v := range v.Components {
-		r.Components[i] = v.MessageComponent
+	for i, c := range v.Components {
+		r.Components[i] = c.MessageComponent
 	}
 
-	return err
+	return nil
 }
 
 type Button struct {