refactor(discord): move bot init and commands to commands package

Author: BK1031

discord/commands/handler.go

@@ -0,0 +1,46 @@
+package commands
+
+import (
+	"strings"
+
+	"github.com/bwmarrin/discordgo"
+	"github.com/gaucho-racing/sentinel/discord/config"
+	"github.com/gaucho-racing/sentinel/discord/pkg/logger"
+	"github.com/gaucho-racing/sentinel/discord/service"
+)
+
+func InitializeBot() {
+	if service.Discord == nil {
+		logger.SugarLogger.Errorln("Discord session is not connected")
+		return
+	}
+	service.Discord.AddHandler(OnDiscordMessage)
+	service.Discord.Identify.Intents = discordgo.MakeIntent(discordgo.IntentsAll)
+	err := service.Discord.Open()
+	if err != nil {
+		logger.SugarLogger.Errorln("Error opening Discord connection:", err)
+		return
+	}
+	logger.SugarLogger.Infof("Discord Bot is now running! [Prefix = %s]", config.DiscordPrefix)
+}
+
+func OnDiscordMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
+	if m.Author.ID == s.State.User.ID {
+		return
+	}
+	if !strings.HasPrefix(m.Content, config.DiscordPrefix) {
+		return
+	}
+	parts := strings.Fields(m.Content[len(config.DiscordPrefix):])
+	if len(parts) == 0 {
+		return
+	}
+	command := parts[0]
+	args := parts[1:]
+	switch command {
+	case "ping":
+		Ping(args, s, m)
+	default:
+		logger.SugarLogger.Infof("Unknown command: %s", command)
+	}
+}

discord/service/ping.go discord/commands/ping.godiscord/service/ping.go renamed to discord/commands/ping.go

@@ -1,4 +1,4 @@
-package service
+package commands
 
 import (
 	"strconv"
@@ -7,7 +7,7 @@ import (
 	"github.com/gaucho-racing/sentinel/discord/config"
 )
 
-func Ping(s *discordgo.Session, m *discordgo.MessageCreate) {
+func Ping(args []string, s *discordgo.Session, m *discordgo.MessageCreate) {
 	message, err := s.ChannelMessageSend(m.ChannelID, "Pong from "+config.Service.FormattedNameWithVersion()+"!")
 	if err == nil {
 		delay := message.Timestamp.Sub(m.Timestamp).Milliseconds()

discord/config/verify.go

@@ -38,7 +38,7 @@ func Verify() {
 		logger.SugarLogger.Warnln("DISCORD_GUILD is not set")
 	}
 	if DiscordPrefix == "" {
-		DiscordPrefix = "s!"
+		DiscordPrefix = "d!"
 		logger.SugarLogger.Infof("DISCORD_PREFIX is not set, defaulting to %s", DiscordPrefix)
 	}
 }

discord/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"github.com/gaucho-racing/sentinel/discord/api"
+	"github.com/gaucho-racing/sentinel/discord/commands"
 	"github.com/gaucho-racing/sentinel/discord/config"
 	"github.com/gaucho-racing/sentinel/discord/database"
 	"github.com/gaucho-racing/sentinel/discord/pkg/logger"
@@ -18,7 +19,7 @@ func main() {
 	rincon.Init(&config.Service, &config.Routes)
 	database.Init()
 	service.ConnectDiscord()
-	service.InitializeBot()
+	commands.InitializeBot()
 
 	api.Run()
 }

discord/service/discord.go

@@ -17,64 +17,3 @@ func ConnectDiscord() {
 	Discord = dg
 	logger.SugarLogger.Infoln("Created Discord session")
 }
-
-func InitializeBot() {
-	Discord.AddHandler(OnDiscordMessage)
-	Discord.Identify.Intents = discordgo.MakeIntent(discordgo.IntentsAll)
-	err := Discord.Open()
-	if err != nil {
-		logger.SugarLogger.Errorln("Error opening Discord connection:", err)
-		return
-	}
-	logger.SugarLogger.Infof("Discord Bot is now running! [Prefix = %s]", config.DiscordPrefix)
-}
-
-func OnDiscordMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
-	if m.Author.ID == s.State.User.ID {
-		return
-	}
-	if len(m.Content) < len(config.DiscordPrefix) || m.Content[:len(config.DiscordPrefix)] != config.DiscordPrefix {
-		return
-	}
-	args := splitCommand(m.Content[len(config.DiscordPrefix):])
-	if len(args) == 0 {
-		return
-	}
-	command := args[0]
-	args = args[1:]
-	switch command {
-	case "ping":
-		Ping(s, m)
-	default:
-		logger.SugarLogger.Infof("Unknown command: %s", command)
-	}
-}
-
-func splitCommand(s string) []string {
-	var result []string
-	for _, part := range splitBySpace(s) {
-		if part != "" {
-			result = append(result, part)
-		}
-	}
-	return result
-}
-
-func splitBySpace(s string) []string {
-	var parts []string
-	current := ""
-	for _, c := range s {
-		if c == ' ' {
-			if current != "" {
-				parts = append(parts, current)
-				current = ""
-			}
-		} else {
-			current += string(c)
-		}
-	}
-	if current != "" {
-		parts = append(parts, current)
-	}
-	return parts
-}

docker-compose.yml

@@ -44,7 +44,7 @@ services:
       DATABASE_NAME: sentinel
       DISCORD_TOKEN: ${DISCORD_TOKEN}
       DISCORD_GUILD: ${DISCORD_GUILD}
-      DISCORD_PREFIX: ${DISCORD_PREFIX:-s!}
+      DISCORD_PREFIX: d!
 
   db:
     container_name: sentinel-db