More refactors, turning things into packages

.gitignore

@@ -1,3 +1,3 @@
 .env
 *.exe
-frodo-bot
+/frodo-bot

README.md

@@ -25,7 +25,7 @@ Then fill in `.env`:
 ### 2. Run
 
 ```bash
-go run .
+go run ./cmd/frodo-bot
 ```
 
 ### 3. Supported Commands

main.go → cmd/frodo-bot/main.go

@@ -7,6 +7,8 @@ import (
 	"os/signal"
 	"syscall"
 
+	"github.com/SimonKimDev/frodo-bot/internal/bot"
+	"github.com/SimonKimDev/frodo-bot/internal/config"
 	"github.com/bwmarrin/discordgo"
 )
 
@@ -17,7 +19,7 @@ func main() {
 }
 
 func run() error {
-	cfg, err := loadConfig()
+	cfg, err := config.Load()
 	if err != nil {
 		return fmt.Errorf("config failed: %w", err)
 	}
@@ -27,11 +29,8 @@ func run() error {
 		return fmt.Errorf("bot failed to init: %w", err)
 	}
 
-	bot := newBot(cfg)
-	discord.AddHandler(bot.onReady)
-	discord.AddHandler(bot.onMessage)
-
-	discord.Identify.Intents = discordgo.IntentsMessageContent | discordgo.IntentsGuildMessages
+	b := bot.New(cfg)
+	b.Register(discord)
 
 	// open session
 	err = discord.Open()

go.mod

@@ -1,4 +1,4 @@
-module frodo-bot
+module github.com/SimonKimDev/frodo-bot
 
 go 1.26.1
 

internal/bot/bot.go

@@ -0,0 +1,27 @@
+package bot
+
+import (
+	"log"
+
+	"github.com/SimonKimDev/frodo-bot/internal/config"
+	"github.com/bwmarrin/discordgo"
+)
+
+type Bot struct {
+	gifURL string
+}
+
+func New(cfg config.Config) *Bot {
+	return &Bot{gifURL: cfg.GIFURL}
+}
+
+func (b *Bot) Register(s *discordgo.Session) {
+	s.AddHandler(b.onReady)
+	s.AddHandler(b.onMessage)
+	s.Identify.Intents = discordgo.IntentsMessageContent | discordgo.IntentsGuildMessages
+}
+
+func (b *Bot) onReady(s *discordgo.Session, r *discordgo.Ready) {
+	user := r.User
+	log.Printf("logged in as %v", user.Username)
+}

bot.go → internal/bot/secret.go

@@ -1,24 +1,12 @@
-package main
+package bot
 
 import (
 	"log"
+	"strings"
 
 	"github.com/bwmarrin/discordgo"
 )
 
-type Bot struct {
-	gifURL string
-}
-
-func newBot(cfg Config) *Bot {
-	return &Bot{gifURL: cfg.GIFURL}
-}
-
-func (b *Bot) onReady(s *discordgo.Session, r *discordgo.Ready) {
-	user := r.User
-	log.Printf("logged in as %v", user.Username)
-}
-
 func (b *Bot) onMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
 	if m.Author.Bot {
 		return
@@ -32,3 +20,7 @@ func (b *Bot) onMessage(s *discordgo.Session, m *discordgo.MessageCreate) {
 		log.Printf("failed to send messages with %v", err)
 	}
 }
+
+func shouldReply(content string) bool {
+	return strings.Contains(strings.ToLower(content), "secret")
+}

config.go → internal/config/config.go

@@ -1,4 +1,4 @@
-package main
+package config
 
 import (
 	"errors"
@@ -13,7 +13,7 @@ type Config struct {
 	GIFURL string
 }
 
-func loadConfig() (Config, error) {
+func Load() (Config, error) {
 	if err := godotenv.Load(); err != nil {
 		log.Printf(".env file is missing, using environment variable")
 	}