Removed default_channel from parseconfig.go

This commit is contained in:
Matthieu Grieger 2014-12-13 16:35:27 -08:00
parent 233d982b51
commit a1e9d05cf2

View file

@ -21,7 +21,6 @@ type djConfig struct {
} }
type generalConfig struct { type generalConfig struct {
defaultChannel string `toml:"default_channel"`
commandPrefix string `toml:"command_prefix"` commandPrefix string `toml:"command_prefix"`
skipRatio float32 `toml:"skip_ratio"` skipRatio float32 `toml:"skip_ratio"`
} }
@ -55,7 +54,7 @@ type permissionsConfig struct {
func loadConfiguration() (djConfig, error) { func loadConfiguration() (djConfig, error) {
var conf djConfig var conf djConfig
if _, err := toml.DecodeFile("config.toml", &conf); err != nil { if _, err := toml.DecodeFile("~/.mumbledj/config/config.toml", &conf); err != nil {
return conf, errors.New("Configuration load failed.") return conf, errors.New("Configuration load failed.")
} }
return conf, nil return conf, nil