Exp/interaction data union (#29)

* exp with an interaction data union

* compiler panic

* comment out assignment

* upgrade routing, mostly stable

* fix Route field on Request

* remove migration to seperate folders

* feat: modals

* fix: constant naming, CI pipeline

.github/workflows/ci.yml

@@ -15,15 +15,10 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.18.0-beta1"
-          stable: "false"
+          go-version: "1.18"
       - name: Run Tests
         run: go test -race -v ./...
       - name: Run Vet
         run: go vet ./...
       - name: Example Compliance
-        run: |
-          go build ./0_example/bongo
-          go build ./0_example/moderate-myself
-          go build ./0_example/nft
-          go build ./0_example/todo
+        run: go build -v -a ./0_example/...

0_example/bongo/main.go

@@ -25,7 +25,7 @@ func main() {
 	}
 
 	m := corde.NewMux(pk, appID, token)
-	m.Command("bongo", bongoHandler)
+	m.SlashCommand("bongo", bongoHandler)
 
 	g := corde.GuildOpt(corde.SnowflakeFromString(os.Getenv("DISCORD_GUILD_ID")))
 	if err := m.RegisterCommand(command, g); err != nil {
@@ -38,7 +38,7 @@ func main() {
 	}
 }
 
-func bongoHandler(w corde.ResponseWriter, _ *corde.InteractionRequest) {
+func bongoHandler(w corde.ResponseWriter, _ *corde.Request[corde.SlashCommandInteractionData]) {
 	resp, err := http.Get("https://cdn.discordapp.com/emojis/745709799890747434.gif?size=128")
 	if err != nil {
 		w.Respond(corde.NewResp().Content("couldn't retrieve bongo").Ephemeral())

0_example/modal/main.go

@@ -0,0 +1,59 @@
+package main
+
+import (
+	"encoding/json"
+	"log"
+	"os"
+
+	"github.com/Karitham/corde"
+)
+
+var command = corde.NewSlashCommand("modal", "send a modal")
+
+func main() {
+	token := os.Getenv("DISCORD_BOT_TOKEN")
+	if token == "" {
+		log.Fatalln("DISCORD_BOT_TOKEN not set")
+	}
+	appID := corde.SnowflakeFromString(os.Getenv("DISCORD_APP_ID"))
+	if appID == 0 {
+		log.Fatalln("DISCORD_APP_ID not set")
+	}
+	pk := os.Getenv("DISCORD_PUBLIC_KEY")
+	if pk == "" {
+		log.Fatalln("DISCORD_PUBLIC_KEY not set")
+	}
+
+	m := corde.NewMux(pk, appID, token)
+	m.SlashCommand("modal", respondModal)
+	m.Modal("pog-modal", func(w corde.ResponseWriter, r *corde.Request[corde.ModalInteractionData]) {
+		json.NewEncoder(os.Stderr).Encode(r)
+		w.DeferedUpdate()
+	})
+
+	g := corde.GuildOpt(corde.SnowflakeFromString(os.Getenv("DISCORD_GUILD_ID")))
+	if err := m.RegisterCommand(command, g); err != nil {
+		log.Fatalln("error registering command: ", err)
+	}
+
+	log.Println("serving on :8070")
+	if err := m.ListenAndServe(":8070"); err != nil {
+		log.Fatalln(err)
+	}
+}
+
+func respondModal(w corde.ResponseWriter, r *corde.Request[corde.SlashCommandInteractionData]) {
+	w.Modal(corde.Modal{
+		Title:    "xoxo",
+		CustomID: "pog-modal",
+		Components: []corde.Component{
+			corde.TextInputComponent{
+				CustomID:    "pog-component",
+				Style:       corde.TEXT_PARAGRAPH,
+				Label:       "label",
+				Required:    false,
+				Placeholder: "placeholder",
+			}.Component(),
+		},
+	})
+}

0_example/moderate-myself/commands_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/Karitham/corde"
+
 	"github.com/Karitham/corde/owmock"
 )
 
@@ -15,7 +16,7 @@ func Test_list(t *testing.T) {
 	tests := []struct {
 		name        string
 		mock        owmock.ResponseWriterMock
-		interaction *corde.InteractionRequest
+		interaction *corde.Request[corde.SlashCommandInteractionData]
 	}{
 		{
 			name: "list",
@@ -30,7 +31,7 @@ func Test_list(t *testing.T) {
 					}
 				},
 			},
-			interaction: &corde.InteractionRequest{},
+			interaction: &corde.Request[corde.SlashCommandInteractionData]{},
 		},
 	}
 	for _, tt := range tests {
@@ -45,8 +46,8 @@ func Test_btnNext(t *testing.T) {
 	tests := []struct {
 		name        string
 		mock        owmock.ResponseWriterMock
-		interaction *corde.InteractionRequest
-		fn          func(corde.ResponseWriter, *corde.InteractionRequest)
+		interaction *corde.Request[corde.ButtonInteractionData]
+		fn          func(corde.ResponseWriter, *corde.Request[corde.ButtonInteractionData])
 	}{
 		{
 			name: "btn next",
@@ -63,7 +64,7 @@ func Test_btnNext(t *testing.T) {
 					}
 				},
 			},
-			interaction: &corde.InteractionRequest{},
+			interaction: &corde.Request[corde.ButtonInteractionData]{},
 			fn:          btnNext(&corde.Mux{Client: http.DefaultClient}, corde.GuildOpt(0), &sync.Mutex{}, &selectedID),
 		},
 	}

0_example/moderate-myself/main.go

@@ -36,9 +36,9 @@ func main() {
 	m := corde.NewMux(pk, appID, token)
 	m.Route("cmd", func(m *corde.Mux) {
 		m.Route("list", func(m *corde.Mux) {
-			m.Command("", list(m, g))
-			m.Button("next", btnNext(m, g, mu, &selectedID))
-			m.Button("remove", btnRemove(m, g, mu, &selectedID))
+			m.SlashCommand("", list(m, g))
+			m.ButtonComponent("next", btnNext(m, g, mu, &selectedID))
+			m.ButtonComponent("remove", btnRemove(m, g, mu, &selectedID))
 		})
 	})
 
@@ -68,8 +68,8 @@ var delBtn = corde.Component{
 	Emoji:    &corde.Emoji{Name: "🗑️"},
 }
 
-func list(m *corde.Mux, g func(*corde.CommandsOpt)) func(corde.ResponseWriter, *corde.InteractionRequest) {
-	return func(w corde.ResponseWriter, _ *corde.InteractionRequest) {
+func list(m *corde.Mux, g func(*corde.CommandsOpt)) func(corde.ResponseWriter, *corde.Request[corde.SlashCommandInteractionData]) {
+	return func(w corde.ResponseWriter, _ *corde.Request[corde.SlashCommandInteractionData]) {
 		w.Respond(corde.NewResp().
 			ActionRow(nextBtn).
 			Ephemeral().
@@ -78,8 +78,8 @@ func list(m *corde.Mux, g func(*corde.CommandsOpt)) func(corde.ResponseWriter, *
 	}
 }
 
-func btnNext(m *corde.Mux, g func(*corde.CommandsOpt), mu *sync.Mutex, selectedID *int) func(corde.ResponseWriter, *corde.InteractionRequest) {
-	return func(w corde.ResponseWriter, _ *corde.InteractionRequest) {
+func btnNext(m *corde.Mux, g func(*corde.CommandsOpt), mu *sync.Mutex, selectedID *int) func(corde.ResponseWriter, *corde.Request[corde.ButtonInteractionData]) {
+	return func(w corde.ResponseWriter, _ *corde.Request[corde.ButtonInteractionData]) {
 		mu.Lock()
 		defer mu.Unlock()
 		commands, err := m.GetCommands(g)
@@ -102,8 +102,8 @@ func btnNext(m *corde.Mux, g func(*corde.CommandsOpt), mu *sync.Mutex, selectedI
 	}
 }
 
-func btnRemove(m *corde.Mux, g func(*corde.CommandsOpt), mu *sync.Mutex, selectedID *int) func(corde.ResponseWriter, *corde.InteractionRequest) {
-	return func(w corde.ResponseWriter, _ *corde.InteractionRequest) {
+func btnRemove(m *corde.Mux, g func(*corde.CommandsOpt), mu *sync.Mutex, selectedID *int) func(corde.ResponseWriter, *corde.Request[corde.ButtonInteractionData]) {
+	return func(w corde.ResponseWriter, _ *corde.Request[corde.ButtonInteractionData]) {
 		mu.Lock()
 		defer mu.Unlock()
 		commands, err := m.GetCommands(g)
@@ -116,6 +116,11 @@ func btnRemove(m *corde.Mux, g func(*corde.CommandsOpt), mu *sync.Mutex, selecte
 		m.DeleteCommand(c.ID, g)
 
 		commands, _ = m.GetCommands(g)
+		if len(commands) == 0 {
+			w.Update(corde.NewResp().Content("No commands found.").Ephemeral())
+			return
+		}
+
 		*selectedID = (*selectedID + 1) % len(commands)
 
 		w.Update(corde.NewResp().

0_example/nft/main.go

@@ -39,8 +39,8 @@ func main() {
 	}
 
 	m.Route("nft", func(m *corde.Mux) {
-		m.Command("user", NFTuser)
-		m.Command("message", NFTmessage)
+		m.UserCommand("user", NFTuser)
+		m.MessageCommand("message", NFTmessage)
 	})
 
 	log.Println("serving on :8070")
@@ -49,37 +49,36 @@ func main() {
 	}
 }
 
-func NFTuser(w corde.ResponseWriter, i *corde.InteractionRequest) {
+func NFTuser(w corde.ResponseWriter, i *corde.Request[corde.UserCommandInteractionData]) {
 	user := i.Data.Resolved.Users.First()
 	url := user.AvatarURL()
-	username := user.Username
 
 	if url == "" {
-		w.Respond(corde.NewResp().Contentf("error getting %s's profile pic", username).Ephemeral())
+		w.Respond(corde.NewResp().Contentf("error getting %s's profile pic", user.Username).Ephemeral())
 		return
 	}
 
 	resp, err := http.Get(url)
 	if err != nil {
-		w.Respond(corde.NewResp().Contentf("error getting %s's profile pic", username).Ephemeral())
+		w.Respond(corde.NewResp().Contentf("error getting %s's profile pic", user.Username).Ephemeral())
 		return
 	}
 	defer resp.Body.Close()
 
 	filename := filepath.Base(url)
 	w.Respond(corde.NewResp().
-		Contentf("Good job %s, you just minted %s's profile picture", i.User.Username, username).
+		Contentf("Good job %s, you just minted %s's profile picture", i.Member.User.Username, user.Username).
 		Attachment(resp.Body, filename),
 	)
 }
 
-func NFTmessage(w corde.ResponseWriter, i *corde.InteractionRequest) {
+func NFTmessage(w corde.ResponseWriter, i *corde.Request[corde.MessageCommandInteractionData]) {
 	msg := i.Data.Resolved.Messages.First()
 	chanID := msg.ChannelID
 	msgID := msg.ID
 
 	message := fmt.Sprintf("https://discordapp.com/channels/%d/%d/%d", i.GuildID, chanID, msgID)
 	w.Respond(corde.NewResp().
-		Contentf("Good job %s, you just minted this message, here's the link %s", i.User.Username, message),
+		Contentf("Good job %s, you just minted this message, here's the link %s", i.Member.User.Username, message),
 	)
 }

0_example/todo/main.go

@@ -41,10 +41,10 @@ func main() {
 
 	m := corde.NewMux(pk, appID, token)
 	m.Route("todo", func(m *corde.Mux) {
-		m.Command("add", t.addHandler)
-		m.Command("list", t.listHandler)
+		m.SlashCommand("add", t.addHandler)
+		m.SlashCommand("list", t.listHandler)
 		m.Route("rm", func(m *corde.Mux) {
-			m.Command("", t.removeHandler)
+			m.SlashCommand("", t.removeHandler)
 			m.Autocomplete("name", t.autoCompleteNames)
 		})
 	})

0_example/todo/todo.go

@@ -6,6 +6,7 @@ import (
 	"sync"
 
 	"github.com/Karitham/corde"
+
 	"github.com/Karitham/corde/format"
 )
 
@@ -19,7 +20,7 @@ type todoItem struct {
 	value string
 }
 
-func (t *todo) autoCompleteNames(w corde.ResponseWriter, _ *corde.InteractionRequest) {
+func (t *todo) autoCompleteNames(w corde.ResponseWriter, _ *corde.Request[corde.AutocompleteInteractionData]) {
 	t.mu.Lock()
 	defer t.mu.Unlock()
 
@@ -36,7 +37,7 @@ func (t *todo) autoCompleteNames(w corde.ResponseWriter, _ *corde.InteractionReq
 	w.Autocomplete(resp)
 }
 
-func (t *todo) addHandler(w corde.ResponseWriter, i *corde.InteractionRequest) {
+func (t *todo) addHandler(w corde.ResponseWriter, i *corde.Request[corde.SlashCommandInteractionData]) {
 	value, _ := i.Data.Options.String("value")
 	name, _ := i.Data.Options.String("name")
 
@@ -56,7 +57,7 @@ func (t *todo) addHandler(w corde.ResponseWriter, i *corde.InteractionRequest) {
 	w.Respond(corde.NewResp().Contentf("Successfully added %s", name).Ephemeral())
 }
 
-func (t *todo) listHandler(w corde.ResponseWriter, _ *corde.InteractionRequest) {
+func (t *todo) listHandler(w corde.ResponseWriter, _ *corde.Request[corde.SlashCommandInteractionData]) {
 	t.mu.Lock()
 	defer t.mu.Unlock()
 
@@ -79,7 +80,7 @@ func (t *todo) listHandler(w corde.ResponseWriter, _ *corde.InteractionRequest)
 	)
 }
 
-func (t *todo) removeHandler(w corde.ResponseWriter, i *corde.InteractionRequest) {
+func (t *todo) removeHandler(w corde.ResponseWriter, i *corde.Request[corde.SlashCommandInteractionData]) {
 	t.mu.Lock()
 	defer t.mu.Unlock()