Partners and Servers are now slices

1 files changed, 7 insertions, 25 deletions

diff --git a/internal/config/client/client.go b/internal/config/client/client.go
index acb3503..d6f2939 100644
--- a/internal/config/client/client.go
+++ b/internal/config/client/client.go
@@ -1,22 +1,20 @@
 package client
 
 import (
-	"errors"
 	"fmt"
 	"log"
 	"os"
-	"strings"
 
 	"codeberg.org/snonux/gos/internal/config"
 )
 
 type ClientConfig struct {
-	Server      string `json:"Partner,omitempty"`
-	APIKey      string `json:"APIKey,omitempty"`
-	Editor      string `json:"Editor,omitempty"`
-	DataDir     string `json:"StateDir,omitempty"`
-	ComposeFile string `json:"ComposeFile,omitempty"`
-	LogFile     string `json:"LogFile,omitempty"`
+	Servers     []string `json:"Servers,omitempty"`
+	APIKey      string   `json:"APIKey,omitempty"`
+	Editor      string   `json:"Editor,omitempty"`
+	DataDir     string   `json:"StateDir,omitempty"`
+	ComposeFile string   `json:"ComposeFile,omitempty"`
+	LogFile     string   `json:"LogFile,omitempty"`
 }
 
 func New(configFile string) (ClientConfig, error) {
@@ -28,7 +26,7 @@ func New(configFile string) (ClientConfig, error) {
 		log.Println("Skipping config file:", err)
 	}
 
-	conf.Server = config.EnvToStr("GOS_SERVERS", conf.Server)
+	conf.Servers = config.EnvToStrSlice("GOS_SERVERS", conf.Servers)
 	conf.APIKey = config.EnvToStr("GOS_API_KEY", conf.APIKey)
 	conf.Editor = config.EnvToStr("GOS_EDITOR", "EDITOR", conf.Editor, "vi")
 
@@ -41,19 +39,3 @@ func New(configFile string) (ClientConfig, error) {
 
 	return conf, nil
 }
-
-func (conf ClientConfig) Servers() ([]string, error) {
-	var servers []string
-
-	for _, server := range strings.Split(conf.Server, ",") {
-		if server != "" {
-			servers = append(servers, server)
-		}
-	}
-
-	if len(servers) == 0 {
-		return servers, errors.New("no server(s) configured")
-	}
-
-	return servers, nil
-}