Skip to content

Commit 29ab0bb

Browse files
committed
default config values, and config issue fixes
1 parent 9c10cc3 commit 29ab0bb

File tree

1 file changed

+28
-6
lines changed

1 file changed

+28
-6
lines changed

internal/bot/main.go

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"log/slog"
66
"os"
77
"os/signal"
8+
"strings"
89
"syscall"
910
"time"
1011

@@ -34,7 +35,7 @@ func Start() {
3435
loadConfig()
3536

3637
// create new music bot
37-
bot, err := NewMusicBot(k.String("DISCORD_TOKEN"))
38+
bot, err := NewMusicBot(k.String("discord.token"))
3839
if err != nil {
3940
msg := "error while creating disgo client"
4041
logger.Error(msg, eris.Wrap(err, msg))
@@ -49,13 +50,13 @@ func Start() {
4950

5051
guilds := []snowflake.ID{}
5152

52-
if k.Exists("GUILD_ID") {
53-
id := k.Int64("GUILD_ID")
54-
logger.Info("GUILD_ID is set, syncing only one guild", slog.Int64("GUILD_ID", id))
53+
if k.Exists("guild.id") {
54+
id := k.Int64("guild.id")
55+
logger.Info("guild_id is set, syncing only one guild", slog.Int64("guild.id", id))
5556

5657
guilds = append(guilds, snowflake.ID(id))
5758
} else {
58-
logger.Info("GUILD_ID is not set, syncing all guilds")
59+
logger.Info("guild.id is not set, syncing all guilds")
5960
}
6061

6162
// sync commands to discord
@@ -93,9 +94,30 @@ func loadConfig() {
9394

9495
// Load environment variables.
9596
if err := k.Load(env.Provider("", ".", func(str string) string {
96-
return str
97+
// convert env var names to lowercase and replace _ with .
98+
// konaf is case sensitive
99+
return strings.Replace(strings.ToLower(str), "_", ".", -1)
97100
}), nil); err != nil {
98101
msg := "error while loading environment variables"
99102
logger.Error(msg, eris.Wrap(err, msg))
100103
}
104+
105+
// Set default values
106+
setDefaultConfig()
107+
}
108+
109+
func setDefaultConfig() {
110+
// Set default config values
111+
112+
// lavalink stuff
113+
if !k.Exists("lavalink.node.name") {
114+
k.Set("lavalink.node.name", "default")
115+
}
116+
if !k.Exists("lavalink.node.address") {
117+
logger.Warn("lavalink.node.address is not set, using default value", slog.String("lavalink.node.address", "localhost:2333"))
118+
k.Set("lavalink.node.address", "localhost:2333")
119+
}
120+
if !k.Exists("lavalink.node.password") {
121+
k.Set("lavalink.node.password", "youshallnotpass")
122+
}
101123
}

0 commit comments

Comments
 (0)