chore(storage): common sorting for all servers

internal/provider/expressvpn/updater/servers.go

@@ -5,6 +5,7 @@ package expressvpn
 import (
 	"context"
 	"fmt"
+	"sort"
 
 	"github.com/qdm12/gluetun/internal/constants/vpn"
 	"github.com/qdm12/gluetun/internal/models"
@@ -47,7 +48,7 @@ func (u *Updater) GetServers(ctx context.Context, minServers int) (
 			common.ErrNotEnoughServers, len(servers), minServers)
 	}
 
-	sortServers(servers)
+	sort.Sort(models.SortableServers(servers))
 
 	return servers, nil
 }

internal/provider/expressvpn/updater/sort.go

@@ -1,19 +0,0 @@
-package expressvpn
-
-import (
-	"sort"
-
-	"github.com/qdm12/gluetun/internal/models"
-)
-
-func sortServers(servers []models.Server) {
-	sort.Slice(servers, func(i, j int) bool {
-		if servers[i].Country == servers[j].Country {
-			if servers[i].City == servers[j].City {
-				return servers[i].Hostname < servers[j].Hostname
-			}
-			return servers[i].City < servers[j].City
-		}
-		return servers[i].Country < servers[j].Country
-	})
-}