Fix server filtering using merged server data

This commit is contained in:
Quentin McGaw
2020-08-27 23:06:28 +00:00
parent 93aaf1ab02
commit 99ba56f574
8 changed files with 16 additions and 20 deletions

View File

@@ -20,8 +20,7 @@ func newMullvad(servers []models.MullvadServer) *mullvad {
}
func (m *mullvad) filterServers(country, city, isp string) (servers []models.MullvadServer) {
allServers := constants.MullvadServers()
for i, server := range allServers {
for i, server := range m.servers {
if len(country) == 0 {
server.Country = ""
}
@@ -34,7 +33,7 @@ func (m *mullvad) filterServers(country, city, isp string) (servers []models.Mul
if strings.EqualFold(server.Country, country) &&
strings.EqualFold(server.City, city) &&
strings.EqualFold(server.ISP, isp) {
servers = append(servers, allServers[i])
servers = append(servers, m.servers[i])
}
}
return servers