Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions libs/go/meowbot/feature/db/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ func InitDB(ctx context.Context) error {
if connStr == "" {
// Log a warning or use a fallback connection string for local dev environments
connStr = "postgres://default_user:default_password@127.0.0.1:5432/meowbot?sslmode=disable"
} else {
user := util.Cfg.DatabaseUser
pass := util.Cfg.DatabasePassword
url := util.Cfg.DatabaseURL

connStr = fmt.Sprintf("postgres://%s:%s@%s", user, pass, url)
}

// Open the database connection
Expand Down
38 changes: 21 additions & 17 deletions libs/go/meowbot/util/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@ import (
var Cfg = LoadConfig()

type AppConfig struct {
Mode string
Debug bool
IsProd bool
BotToken string
ApiPort string
DatabaseURL string
EmojiList string
Logger *slog.Logger
Whitelist struct {
Mode string
Debug bool
IsProd bool
BotToken string
ApiPort string
DatabaseURL string
DatabaseUser string
DatabasePassword string
EmojiList string
Logger *slog.Logger
Whitelist struct {
Guilds []string
}
}
Expand Down Expand Up @@ -52,14 +54,16 @@ func LoadConfig() AppConfig {
}

return AppConfig{
Mode: mode,
Debug: debug,
IsProd: mode == "production",
ApiPort: apiPort,
BotToken: os.Getenv("DISCORD_BOT_TOKEN"),
DatabaseURL: os.Getenv("DATABASE_URL"),
EmojiList: os.Getenv("EMOJI_LIST"),
Logger: logger,
Mode: mode,
Debug: debug,
IsProd: mode == "production",
ApiPort: apiPort,
BotToken: os.Getenv("DISCORD_BOT_TOKEN"),
DatabaseURL: os.Getenv("DATABASE_URL"),
DatabaseUser: os.Getenv("DATABASE_USER"),
DatabasePassword: os.Getenv("DATABASE_PASSWORD"),
EmojiList: os.Getenv("EMOJI_LIST"),
Logger: logger,
Whitelist: struct {
Guilds []string
}{Guilds: guilds},
Expand Down