Merge pull request #18 from Lumos-Programming/feat/tryhackme-achievement

✨ TryHackMe達成コマンドの追加

Author: Shion1305

.gitignore

@@ -1 +1,2 @@
-.env
+.env*
+!.env.template

cmd/cmd.go

@@ -13,6 +13,7 @@ type cmd struct {
 type SubCmd interface {
 	Handle(s *discordgo.Session, i *discordgo.InteractionCreate)
 	Info() *discordgo.ApplicationCommand
+	ModalCustomIDs() []string
 }
 
 func (c exec) Activate(s *discordgo.Session) cmd {

cmd/delete/main.go

@@ -113,3 +113,7 @@ func (n DeleteCmd) Handle(
 		return
 	}
 }
+
+func (n DeleteCmd) ModalCustomIDs() []string {
+	return []string{}
+}

cmd/exec.go

@@ -6,24 +6,37 @@ import (
 )
 
 type exec struct {
-	cmds map[string]SubCmd
+	cmds   map[string]SubCmd
+	modals map[string]SubCmd
 }
 
 func NewExec() *exec {
-	return &exec{}
+	return &exec{
+		cmds:   make(map[string]SubCmd),
+		modals: make(map[string]SubCmd),
+	}
 }
 
 func (c *exec) Add(i SubCmd) {
-	if c.cmds == nil {
-		c.cmds = make(map[string]SubCmd)
-	}
 	c.cmds[i.Info().Name] = i
+	for _, cid := range i.ModalCustomIDs() {
+		c.modals[cid] = i
+	}
+	log.Println("added command: ", i.Info().Name)
 }
 
 func (c *exec) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) {
-	if h, ok := c.cmds[i.ApplicationCommandData().Name]; ok {
+	var name string
+	switch i.Type {
+	case discordgo.InteractionApplicationCommand:
+		name = i.ApplicationCommandData().Name
+	case discordgo.InteractionModalSubmit:
+		name = i.ModalSubmitData().CustomID
+	}
+
+	if h, ok := c.cmds[name]; ok {
 		h.Handle(s, i)
 	} else {
-		log.Printf("unknown command: %s", i.ApplicationCommandData().Name)
+		log.Printf("unknown command: %s", name)
 	}
 }

cmd/nox/main.go

@@ -65,3 +65,7 @@ func (n NoxCmd) Handle(
 		log.Printf("failed to send followup message, err: %v", err)
 	}
 }
+
+func (n NoxCmd) ModalCustomIDs() []string {
+	return []string{}
+}

cmd/tryhackme-achievement/main.go

@@ -0,0 +1,166 @@
+package tryhackme_achievement
+
+import (
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/bwmarrin/discordgo"
+)
+
+const (
+	cmdName    = "tryhackme-share"
+	modalID    = "tryhackme-share"
+	titleID    = "challenge_title"
+	urlID      = "challenge_url"
+	commentsID = "comments"
+)
+
+// TryHackMeCmd encapsulates all logic for the `/share` command.
+type TryHackMeCmd struct {
+	GuildID string
+}
+
+// NewTryHackMeCmd returns a new command handler.
+func NewTryHackMeCmd(guildID string) *TryHackMeCmd {
+	return &TryHackMeCmd{GuildID: guildID}
+}
+
+// RegisterCommand registers/updates the slash-command every time the bot becomes READY.
+func (c *TryHackMeCmd) RegisterCommand(s *discordgo.Session) error {
+	_, err := s.ApplicationCommandCreate(
+		s.State.User.ID,
+		c.GuildID,
+		&discordgo.ApplicationCommand{
+			Name:        cmdName,
+			Description: "Share your TryHackMe achievement!",
+		},
+	)
+	return err
+}
+
+// Handle must be added with dg.AddHandler.
+// It processes both the slash-command invocation and the modal submit event.
+func (c *TryHackMeCmd) Handle(s *discordgo.Session, i *discordgo.InteractionCreate) {
+	switch i.Type {
+
+	case discordgo.InteractionApplicationCommand:
+		if i.ApplicationCommandData().Name != cmdName {
+			return
+		}
+
+		// Send modal
+		modal := &discordgo.InteractionResponse{
+			Type: discordgo.InteractionResponseModal,
+			Data: &discordgo.InteractionResponseData{
+				CustomID: modalID,
+				Title:    "TryHackMe達成共有しよう!",
+				Components: []discordgo.MessageComponent{
+					discordgo.ActionsRow{
+						Components: []discordgo.MessageComponent{
+							discordgo.TextInput{
+								CustomID:    titleID,
+								Label:       "Room名",
+								Style:       discordgo.TextInputShort,
+								Placeholder: "e.g. 'Blue Team Basics'",
+								Required:    true,
+							},
+						},
+					},
+					discordgo.ActionsRow{
+						Components: []discordgo.MessageComponent{
+							discordgo.TextInput{
+								CustomID:    urlID,
+								Label:       "RoomのURL",
+								Style:       discordgo.TextInputShort,
+								Placeholder: "https://tryhackme.com/room/…",
+								Required:    true,
+							},
+						},
+					},
+					discordgo.ActionsRow{
+						Components: []discordgo.MessageComponent{
+							discordgo.TextInput{
+								CustomID: commentsID,
+								Label:    "Comments (任意)",
+								Style:    discordgo.TextInputParagraph,
+								Required: false,
+							},
+						},
+					},
+				},
+			},
+		}
+
+		if err := s.InteractionRespond(i.Interaction, modal); err != nil {
+			log.Printf("tryhackme: modal respond error: %v", err)
+		}
+
+	case discordgo.InteractionModalSubmit:
+		if i.ModalSubmitData().CustomID != modalID {
+			return
+		}
+
+		// Extract inputs
+		var title, url, comment string
+		for _, cmp := range i.ModalSubmitData().Components {
+			row := cmp.(*discordgo.ActionsRow)
+			for _, inner := range row.Components {
+				input := inner.(*discordgo.TextInput)
+				switch input.CustomID {
+				case titleID:
+					title = input.Value
+				case urlID:
+					url = input.Value
+				case commentsID:
+					comment = input.Value
+				}
+			}
+		}
+
+		name := i.Member.Nick
+		if name == "" {
+			name = i.Member.User.GlobalName
+		}
+		embed := &discordgo.MessageEmbed{
+			Title: "🎖TryHackMe達成共有⭐️",
+			// orange
+			Color:     0xFFA500,
+			Timestamp: time.Now().Format(time.RFC3339),
+			Fields: []*discordgo.MessageEmbedField{
+				{Name: "Room名", Value: title, Inline: true},
+				{Name: "リンク", Value: url, Inline: true},
+			},
+			Footer: &discordgo.MessageEmbedFooter{
+				Text:    fmt.Sprintf("%s(%s)", i.Member.Nick, i.Member.User.Username),
+				IconURL: i.Member.User.AvatarURL(""),
+			},
+		}
+		if comment != "" {
+			embed.Fields = append(embed.Fields, &discordgo.MessageEmbedField{
+				Name:  "Comments",
+				Value: comment,
+			})
+		}
+
+		if err := s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
+			Type: discordgo.InteractionResponseChannelMessageWithSource,
+			Data: &discordgo.InteractionResponseData{
+				Embeds: []*discordgo.MessageEmbed{embed},
+			},
+		}); err != nil {
+			log.Printf("tryhackme: embed respond error: %v", err)
+		}
+	}
+}
+
+func (c *TryHackMeCmd) Info() *discordgo.ApplicationCommand {
+	return &discordgo.ApplicationCommand{
+		Name:        cmdName,
+		Description: "Share your achievement on TryHackMe!",
+	}
+}
+
+func (c *TryHackMeCmd) ModalCustomIDs() []string {
+	return []string{modalID}
+}

main.go

@@ -8,6 +8,7 @@ import (
 	"lumos-discord-bot/cmd"
 	del "lumos-discord-bot/cmd/delete"
 	"lumos-discord-bot/cmd/nox"
+	tryhackme_achievement "lumos-discord-bot/cmd/tryhackme-achievement"
 	"lumos-discord-bot/handler"
 	"os"
 	"os/signal"
@@ -53,6 +54,8 @@ func main() {
 	cmds.Add(noxCmd)
 	deleteCmd := del.NewDeleteCmd()
 	cmds.Add(deleteCmd)
+	tryhackmeAchievementCmd := tryhackme_achievement.NewTryHackMeCmd(targetServer)
+	cmds.Add(tryhackmeAchievementCmd)
 
 	cmdHandler := cmds.Activate(bot)
 	defer cmdHandler.Deactivate()