Merge pull request #28 from Lumos-Programming/shion/fix-invalid-interaction-modal-event-handling

InteractionModalSubmitイベントに対する処理の修正 (#27)

Author: Shion1305

cmd/exec.go

@@ -26,17 +26,24 @@ func (c *exec) Add(i SubCmd) {
 }
 
 func (c *exec) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	var name string
 	switch i.Type {
 	case discordgo.InteractionApplicationCommand:
-		name = i.ApplicationCommandData().Name
+		name := i.ApplicationCommandData().Name
+		if h, ok := c.cmds[name]; ok {
+			h.Handle(s, i)
+		} else {
+			log.Printf("unknown command: %s", name)
+		}
+		return
 	case discordgo.InteractionModalSubmit:
-		name = i.ModalSubmitData().CustomID
-	}
-
-	if h, ok := c.cmds[name]; ok {
-		h.Handle(s, i)
-	} else {
-		log.Printf("unknown command: %s", name)
+		customID := i.ModalSubmitData().CustomID
+		if h, ok := c.modals[customID]; ok {
+			h.Handle(s, i)
+		} else {
+			log.Printf("unknown modal: %s", customID)
+		}
+		return
+	default:
+		log.Printf("unhandled interaction, type: %s, id: %s", i.Type, i.ID)
 	}
 }

cmd/tryhackme-achievement/main.go

@@ -10,7 +10,7 @@ import (
 
 const (
 	cmdName    = "tryhackme-share"
-	modalID    = "tryhackme-share"
+	modalID    = "tryhackme-share-form"
 	titleID    = "challenge_title"
 	urlID      = "challenge_url"
 	commentsID = "comments"