Merge pull request #20 from Lumos-Programming/shion/thm-channel-limit

🐛 THMコマンドでのチャンネル制約追加

Author: Shion1305

cmd/tryhackme-achievement/main.go

@@ -18,12 +18,12 @@ const (
 
 // TryHackMeCmd encapsulates all logic for the `/share` command.
 type TryHackMeCmd struct {
-	GuildID string
+	GuildID, channelID string
 }
 
 // NewTryHackMeCmd returns a new command handler.
-func NewTryHackMeCmd(guildID string) *TryHackMeCmd {
-	return &TryHackMeCmd{GuildID: guildID}
+func NewTryHackMeCmd(guildID, chanID string) *TryHackMeCmd {
+	return &TryHackMeCmd{GuildID: guildID, channelID: chanID}
 }
 
 // RegisterCommand registers/updates the slash-command every time the bot becomes READY.
@@ -43,12 +43,22 @@ func (c *TryHackMeCmd) RegisterCommand(s *discordgo.Session) error {
 // 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
 		}
-
+		if i.ChannelID != c.channelID {
+			if err := s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
+				Type: discordgo.InteractionResponseChannelMessageWithSource,
+				Data: &discordgo.InteractionResponseData{
+					Content: "このコマンドはこのチャンネルでは使用できません。",
+					Flags:   discordgo.MessageFlagsEphemeral,
+				},
+			}); err != nil {
+				log.Printf("tryhackme: respond error: %v", err)
+			}
+			return
+		}
 		// Send modal
 		modal := &discordgo.InteractionResponse{
 			Type: discordgo.InteractionResponseModal,

main.go

@@ -15,11 +15,12 @@ import (
 )
 
 const (
-	EnvDiscordToken   = "DISCORD_TOKEN"
-	EnvTargetServer   = "TARGET_SERVER"
-	EnvWelcomeChannel = "WELCOME_CHANNEL"
-	EnvMemberRoleID   = "MEMBER_ROLE_ID"
-	EnvTestUserID     = "TEST_USER_ID"
+	EnvDiscordToken       = "DISCORD_TOKEN"
+	EnvTargetServer       = "TARGET_SERVER"
+	EnvWelcomeChannel     = "WELCOME_CHANNEL"
+	EnvMemberRoleID       = "MEMBER_ROLE_ID"
+	EnvTestUserID         = "TEST_USER_ID"
+	EnvTHMAchievementChan = "TRYHACKME_ACHIEVEMENT_CHANNEL_ID"
 )
 
 func main() {
@@ -31,6 +32,7 @@ func main() {
 	targetServer := os.Getenv(EnvTargetServer)
 	memberRoleID := os.Getenv(EnvMemberRoleID)
 	testUserID := os.Getenv(EnvTestUserID)
+	thmAchievementChannelID := os.Getenv(EnvTHMAchievementChan)
 
 	bot, err := discordgo.New(fmt.Sprintf("Bot %s", discordToken))
 	if err != nil {
@@ -54,7 +56,7 @@ func main() {
 	cmds.Add(noxCmd)
 	deleteCmd := del.NewDeleteCmd()
 	cmds.Add(deleteCmd)
-	tryhackmeAchievementCmd := tryhackme_achievement.NewTryHackMeCmd(targetServer)
+	tryhackmeAchievementCmd := tryhackme_achievement.NewTryHackMeCmd(targetServer, thmAchievementChannelID)
 	cmds.Add(tryhackmeAchievementCmd)
 
 	cmdHandler := cmds.Activate(bot)