From 103e473f200b76db20ef8d9af3c98db2bfb2aa29 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fischer@muhq.space>
Date: Mon, 31 Jul 2023 18:07:41 +0200
Subject: make time bonus config value usable through yaml

---
 config.go    |  2 +-
 main.go      |  3 ++-
 wrms.go      | 10 +++++-----
 wrms_test.go |  2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/config.go b/config.go
index b2df159..5683f29 100644
--- a/config.go
+++ b/config.go
@@ -22,8 +22,8 @@ type Config struct {
 	AdminPW       string         `yaml:"admin-password"`
 	Admins        []uuid.UUID    `yaml:"admins"`
 	Spotify       *SpotifyConfig `yaml:"spotify"`
+	TimeBonus     float64        `yaml:"time-bonus"`
 	HasUpload     bool
-	timeBonus     float64 `yaml:time-bonus`
 }
 
 func defaultConfig() Config {
diff --git a/main.go b/main.go
index c627894..0b9b956 100644
--- a/main.go
+++ b/main.go
@@ -270,7 +270,8 @@ func main() {
 
 	flag.StringVar(&config.LogLevel, "loglevel", config.LogLevel, "log level")
 	flag.IntVar(&config.Port, "port", config.Port, "port to listen to")
-	flag.Float64Var(&config.timeBonus, "time-bonus", config.timeBonus, "weight bonus granted over time")
+	flag.Float64Var(&config.TimeBonus, "time-bonus", config.TimeBonus,
+		"weight bonus granted over time")
 	backends := flag.String("backends", "", "music backend to use")
 	flag.StringVar(&config.LocalMusicDir,
 		"serve-music-dir", config.LocalMusicDir, "local music directory to serve")
diff --git a/wrms.go b/wrms.go
index 5dfdc53..b2bc2dc 100644
--- a/wrms.go
+++ b/wrms.go
@@ -85,8 +85,8 @@ func (wrms *Wrms) initConn(conn *Connection) error {
 
 	initialCmds := []interface{}{}
 
-	if wrms.Config.timeBonus != 0 {
-		ev := map[string]any{"cmd": "timeBonus", "timeBonus": wrms.Config.timeBonus}
+	if wrms.Config.TimeBonus != 0 {
+		ev := map[string]any{"cmd": "timeBonus", "timeBonus": wrms.Config.TimeBonus}
 		initialCmds = append(initialCmds, ev)
 	}
 
@@ -149,9 +149,9 @@ func (wrms *Wrms) AddSong(song *Song) {
 
 	startPlayingAgain := wrms.playing && wrms.CurrentSong.Load() == nil
 
-	if wrms.Config.timeBonus != 0 {
-		llog.Info("Apply time bonus %v", wrms.Config.timeBonus)
-		wrms.queue.applyTimeBonus(wrms.Config.timeBonus)
+	if wrms.Config.TimeBonus != 0 {
+		llog.Info("Apply time bonus %v", wrms.Config.TimeBonus)
+		wrms.queue.applyTimeBonus(wrms.Config.TimeBonus)
 	}
 
 	wrms._addSong(song)
diff --git a/wrms_test.go b/wrms_test.go
index bfb620d..7d7942c 100644
--- a/wrms_test.go
+++ b/wrms_test.go
@@ -142,7 +142,7 @@ func TestFlipVote(t *testing.T) {
 
 func TestTimeBonus(t *testing.T) {
 	wrms := Wrms{Player: &mockPlayer{}}
-	wrms.Config.timeBonus = 0.1
+	wrms.Config.TimeBonus = 0.1
 	songs := []*Song{
 		NewDummySong("song1", "snfmt"),
 		NewDummySong("song2", "snfmt"),
-- 
cgit v1.2.3