From 60694a870598d10d64849fbea9d6254b38d61765 Mon Sep 17 00:00:00 2001 From: Siwoo Jeon Date: Thu, 17 Apr 2025 19:39:44 +0900 Subject: [PATCH] fix: Using to init function --- commands/discommand.go | 12 +++++------- commands/learnedDataList.go | 2 +- configs/config.go | 12 +++++------- databases/database.go | 12 ++++++------ 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/commands/discommand.go b/commands/discommand.go index f69a5a7..185f20a 100644 --- a/commands/discommand.go +++ b/commands/discommand.go @@ -59,20 +59,20 @@ type Component struct { } const ( - Chattings Category = "채팅" - Generals Category = "일반" + Chatting Category = "채팅" + Generals Category = "일반" ) var commandMutex sync.Mutex var componentMutex sync.Mutex +var Discommand *DiscommandStruct -func new() *DiscommandStruct { - discommand := DiscommandStruct{ +func init() { + Discommand = &DiscommandStruct{ Commands: map[string]*Command{}, Aliases: map[string]string{}, Components: []*Component{}, } - return &discommand } func (d *DiscommandStruct) LoadCommand(c *Command) { @@ -124,5 +124,3 @@ func (d *DiscommandStruct) ComponentRun(s *discordgo.Session, i *discordgo.Inter break } } - -var Discommand *DiscommandStruct = new() diff --git a/commands/learnedDataList.go b/commands/learnedDataList.go index 6558203..feb55e9 100644 --- a/commands/learnedDataList.go +++ b/commands/learnedDataList.go @@ -23,7 +23,7 @@ var LearnedDataListCommand *Command = &Command{ DetailedDescription: &DetailedDescription{ Usage: fmt.Sprintf("%s리스트", configs.Config.Bot.Prefix), }, - Category: Chattings, + Category: Chatting, MessageRun: func(ctx *MsgContext) { learnedDataListRun(ctx.Session, ctx.Msg) }, diff --git a/configs/config.go b/configs/config.go index a10ecef..3af1613 100644 --- a/configs/config.go +++ b/configs/config.go @@ -26,12 +26,12 @@ type MuffinConfig struct { DBName string } -func loadConfig() *MuffinConfig { +var Config *MuffinConfig + +func init() { godotenv.Load() config := &MuffinConfig{Bot: botConfig{}, Train: trainConfig{}} - setConfig(config) - - return config + setValues(config) } func getRequiredValue(key string) string { @@ -46,7 +46,7 @@ func getValue(key string) string { return os.Getenv(key) } -func setConfig(config *MuffinConfig) { +func setValues(config *MuffinConfig) { config.Bot.Prefix = getRequiredValue("BOT_PREFIX") config.Bot.Token = getRequiredValue("BOT_TOKEN") config.Bot.OwnerId = getRequiredValue("BOT_OWNER_ID") @@ -56,5 +56,3 @@ func setConfig(config *MuffinConfig) { config.DatabaseURL = getRequiredValue("DATABASE_URL") config.DBName = getRequiredValue("DATABASE_NAME") } - -var Config *MuffinConfig = loadConfig() diff --git a/databases/database.go b/databases/database.go index 81115f2..d2fc9ee 100644 --- a/databases/database.go +++ b/databases/database.go @@ -8,13 +8,13 @@ import ( "go.mongodb.org/mongo-driver/v2/mongo/options" ) -func connect() *mongo.Client { - client, err := mongo.Connect(options.Client().ApplyURI(configs.Config.DatabaseURL)) +var Client *mongo.Client + +func init() { + var err error + + Client, err = mongo.Connect(options.Client().ApplyURI(configs.Config.DatabaseURL)) if err != nil { log.Fatalln(err) } - - return client } - -var Client *mongo.Client = connect()