fix: whitelist not properly parsed

Signed-off-by: Neko Ayaka <neko@ayaka.moe>

Author: nekomeowww

internal/grpc/services/factorioapi/v1/console/console.go

@@ -12,6 +12,7 @@ import (
 	"github.com/nekomeowww/factorio-rcon-api/pkg/apierrors"
 	"github.com/nekomeowww/factorio-rcon-api/pkg/utils"
 	"github.com/nekomeowww/xo/logger"
+	"github.com/samber/lo"
 	"go.uber.org/fx"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
@@ -603,13 +604,34 @@ func (s *ConsoleService) CommandWhitelistGet(ctx context.Context, req *v1.Comman
 		return nil, apierrors.NewErrInternal().WithDetail(err.Error()).WithError(err).WithCaller().AsStatus()
 	}
 
-	whitelist, err := utils.StringListToPlayers(resp)
+	resp = strings.TrimPrefix(resp, "Whitelisted players:")
+	resp = strings.TrimSpace(resp)
+
+	playerNames := utils.ParseWhitelistedPlayers(resp)
+
+	players := lo.Map(playerNames, func(player string, _ int) *v1.Player {
+		return &v1.Player{
+			Username: player,
+		}
+	})
+
+	savePlayers, err := s.CommandPlayers(ctx, &v1.CommandPlayersRequest{})
 	if err != nil {
 		return nil, err
 	}
 
+	mPlayers := lo.SliceToMap(savePlayers.Players, func(player *v1.Player) (string, *v1.Player) {
+		return player.Username, player
+	})
+
+	for _, player := range players {
+		if p, ok := mPlayers[player.Username]; ok {
+			player.Online = p.Online
+		}
+	}
+
 	return &v1.CommandWhitelistGetResponse{
-		Whitelist: whitelist,
+		Whitelist: players,
 	}, nil
 }
 

internal/grpc/services/factorioapi/v2/console/console.go

@@ -12,6 +12,7 @@ import (
 	"github.com/nekomeowww/factorio-rcon-api/pkg/apierrors"
 	"github.com/nekomeowww/factorio-rcon-api/pkg/utils"
 	"github.com/nekomeowww/xo/logger"
+	"github.com/samber/lo"
 	"go.uber.org/fx"
 	"go.uber.org/zap"
 	"google.golang.org/grpc/codes"
@@ -607,13 +608,34 @@ func (s *ConsoleService) CommandWhitelistGet(ctx context.Context, req *v2.Comman
 		return nil, apierrors.NewErrInternal().WithDetail(err.Error()).WithError(err).WithCaller().AsStatus()
 	}
 
-	whitelist, err := utils.StringListToPlayers(resp)
+	resp = strings.TrimPrefix(resp, "Whitelisted players:")
+	resp = strings.TrimSpace(resp)
+
+	playerNames := utils.ParseWhitelistedPlayers(resp)
+
+	players := lo.Map(playerNames, func(player string, _ int) *v2.Player {
+		return &v2.Player{
+			Username: player,
+		}
+	})
+
+	savePlayers, err := s.CommandPlayers(ctx, &v2.CommandPlayersRequest{})
 	if err != nil {
 		return nil, err
 	}
 
+	mPlayers := lo.SliceToMap(savePlayers.Players, func(player *v2.Player) (string, *v2.Player) {
+		return player.Username, player
+	})
+
+	for _, player := range players {
+		if p, ok := mPlayers[player.Username]; ok {
+			player.Online = p.Online
+		}
+	}
+
 	return &v2.CommandWhitelistGetResponse{
-		Whitelist: utils.MapV1PlayersToV2Players(whitelist),
+		Whitelist: players,
 	}, nil
 }
 

pkg/utils/factorio.go

@@ -99,3 +99,16 @@ func ParseDuration(input string) (time.Duration, error) {
 
 	return totalDuration, nil
 }
+
+func ParseWhitelistedPlayers(input string) []string {
+	// Replace " and " with a comma to unify the delimiters
+	input = strings.ReplaceAll(input, " and ", ", ")
+
+	// Split the players by commas and trim spaces
+	players := strings.Split(input, ", ")
+	for i := range players {
+		players[i] = strings.TrimSpace(players[i])
+	}
+
+	return players
+}

pkg/utils/factorio_test.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"strconv"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -11,3 +12,23 @@ func TestStringListToPlayers(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, players, 2)
 }
+
+func TestParseWhitelistedPlayers(t *testing.T) {
+	type testCase struct {
+		input    string
+		expected []string
+	}
+
+	testCases := []testCase{
+		{input: "NekoMeow", expected: []string{"NekoMeow"}},
+		{input: "LittleSound and NekoMeow", expected: []string{"LittleSound", "NekoMeow"}},
+		{input: "LemonNeko, LittleSound and NekoMeow", expected: []string{"LemonNeko", "LittleSound", "NekoMeow"}},
+	}
+
+	for index, tc := range testCases {
+		t.Run(strconv.Itoa(index), func(t *testing.T) {
+			players := ParseWhitelistedPlayers(tc.input)
+			require.Equal(t, tc.expected, players)
+		})
+	}
+}