From 072b42d867c6b5082873e3d1210c3beb08f7a73d Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Sat, 16 Apr 2022 20:58:54 +0000 Subject: [PATCH] chore(v4): add v4 comments about server names --- internal/configuration/settings/validation/pia.go | 2 +- internal/provider/privateinternetaccess/filter.go | 2 +- internal/provider/protonvpn/filter.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/configuration/settings/validation/pia.go b/internal/configuration/settings/validation/pia.go index 6083c9ed..49b4d1ff 100644 --- a/internal/configuration/settings/validation/pia.go +++ b/internal/configuration/settings/validation/pia.go @@ -20,7 +20,7 @@ func PIAHostnameChoices(servers []models.Server) (choices []string) { return makeUnique(choices) } -func PIANameChoices(servers []models.Server) (choices []string) { +func PIANameChoices(servers []models.Server) (choices []string) { // TODO remove in v4 choices = make([]string, len(servers)) for i := range servers { choices[i] = servers[i].ServerName diff --git a/internal/provider/privateinternetaccess/filter.go b/internal/provider/privateinternetaccess/filter.go index 1c3ca13e..82f0c786 100644 --- a/internal/provider/privateinternetaccess/filter.go +++ b/internal/provider/privateinternetaccess/filter.go @@ -13,7 +13,7 @@ func (p *PIA) filterServers(selection settings.ServerSelection) ( case utils.FilterByPossibilities(server.Region, selection.Regions), utils.FilterByPossibilities(server.Hostname, selection.Hostnames), - utils.FilterByPossibilities(server.ServerName, selection.Names), + utils.FilterByPossibilities(server.ServerName, selection.Names), // TODO remove in v4 utils.FilterByProtocol(selection, server.TCP, server.UDP): default: servers = append(servers, server) diff --git a/internal/provider/protonvpn/filter.go b/internal/provider/protonvpn/filter.go index dd17b5d6..9f23b163 100644 --- a/internal/provider/protonvpn/filter.go +++ b/internal/provider/protonvpn/filter.go @@ -17,7 +17,7 @@ func (p *Protonvpn) filterServers(selection settings.ServerSelection) ( utils.FilterByPossibilities(server.Region, selection.Regions), utils.FilterByPossibilities(server.City, selection.Cities), utils.FilterByPossibilities(server.Hostname, selection.Hostnames), - utils.FilterByPossibilities(server.ServerName, selection.Names), + utils.FilterByPossibilities(server.ServerName, selection.Names), // TODO remove in v4 *selection.FreeOnly && !strings.Contains(strings.ToLower(server.ServerName), "free"): default: servers = append(servers, server)