From d166314f8be341ed211ca07774dbbcd896bc3ebd Mon Sep 17 00:00:00 2001 From: Quentin McGaw Date: Mon, 19 Aug 2024 03:08:14 +0000 Subject: [PATCH] fix(nordvpn): remove commas from region values --- internal/provider/nordvpn/updater/models.go | 4 + internal/provider/nordvpn/updater/servers.go | 2 +- internal/storage/servers.json | 336 +++++++++---------- 3 files changed, 173 insertions(+), 169 deletions(-) diff --git a/internal/provider/nordvpn/updater/models.go b/internal/provider/nordvpn/updater/models.go index 6c2a5178..e2f389d1 100644 --- a/internal/provider/nordvpn/updater/models.go +++ b/internal/provider/nordvpn/updater/models.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "net/netip" + "strings" ) // Check out the JSON data from https://api.nordvpn.com/v2/servers?limit=10 @@ -92,6 +93,9 @@ func (s serversData) idToData() ( ) { groups = make(map[uint32]groupData, len(s.Groups)) for _, group := range s.Groups { + if group.Type.Identifier == "regions" { //nolint:goconst + group.Title = strings.ReplaceAll(group.Title, ",", "") + } groups[group.ID] = group } diff --git a/internal/provider/nordvpn/updater/servers.go b/internal/provider/nordvpn/updater/servers.go index b5427445..82715c72 100644 --- a/internal/provider/nordvpn/updater/servers.go +++ b/internal/provider/nordvpn/updater/servers.go @@ -79,7 +79,7 @@ func extractServers(jsonServer serverData, groups map[uint32]groupData, server := models.Server{ Country: location.Country.Name, - Region: jsonServer.region(groups), + Region: region, City: location.Country.City.Name, Categories: jsonServer.categories(groups), Hostname: jsonServer.Hostname, diff --git a/internal/storage/servers.json b/internal/storage/servers.json index eaecee73..185109bd 100644 --- a/internal/storage/servers.json +++ b/internal/storage/servers.json @@ -87993,7 +87993,7 @@ { "vpn": "openvpn", "country": "Egypt", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Cairo", "categories": [ "Standard VPN servers", @@ -88010,7 +88010,7 @@ { "vpn": "wireguard", "country": "Egypt", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Cairo", "categories": [ "Standard VPN servers", @@ -88026,7 +88026,7 @@ { "vpn": "openvpn", "country": "Egypt", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Cairo", "categories": [ "Standard VPN servers", @@ -88043,7 +88043,7 @@ { "vpn": "wireguard", "country": "Egypt", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Cairo", "categories": [ "Standard VPN servers", @@ -105745,7 +105745,7 @@ { "vpn": "openvpn", "country": "Ghana", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Accra", "categories": [ "Standard VPN servers", @@ -105762,7 +105762,7 @@ { "vpn": "wireguard", "country": "Ghana", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Accra", "categories": [ "Standard VPN servers", @@ -105778,7 +105778,7 @@ { "vpn": "openvpn", "country": "Ghana", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Accra", "categories": [ "Standard VPN servers", @@ -105795,7 +105795,7 @@ { "vpn": "wireguard", "country": "Ghana", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Accra", "categories": [ "Standard VPN servers", @@ -109963,7 +109963,7 @@ { "vpn": "openvpn", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -109980,7 +109980,7 @@ { "vpn": "wireguard", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -109996,7 +109996,7 @@ { "vpn": "openvpn", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110013,7 +110013,7 @@ { "vpn": "wireguard", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110029,7 +110029,7 @@ { "vpn": "openvpn", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110046,7 +110046,7 @@ { "vpn": "wireguard", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110062,7 +110062,7 @@ { "vpn": "openvpn", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110079,7 +110079,7 @@ { "vpn": "wireguard", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110095,7 +110095,7 @@ { "vpn": "openvpn", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110112,7 +110112,7 @@ { "vpn": "wireguard", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110128,7 +110128,7 @@ { "vpn": "openvpn", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110145,7 +110145,7 @@ { "vpn": "wireguard", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110161,7 +110161,7 @@ { "vpn": "openvpn", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110178,7 +110178,7 @@ { "vpn": "wireguard", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110194,7 +110194,7 @@ { "vpn": "openvpn", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110211,7 +110211,7 @@ { "vpn": "wireguard", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110227,7 +110227,7 @@ { "vpn": "openvpn", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110244,7 +110244,7 @@ { "vpn": "wireguard", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110260,7 +110260,7 @@ { "vpn": "openvpn", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -110277,7 +110277,7 @@ { "vpn": "wireguard", "country": "India", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Mumbai", "categories": [ "Standard VPN servers", @@ -112733,7 +112733,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112750,7 +112750,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112766,7 +112766,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112783,7 +112783,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112799,7 +112799,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112816,7 +112816,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112832,7 +112832,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112849,7 +112849,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112865,7 +112865,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112882,7 +112882,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112898,7 +112898,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112915,7 +112915,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112931,7 +112931,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112948,7 +112948,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112964,7 +112964,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112981,7 +112981,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -112997,7 +112997,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113014,7 +113014,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113030,7 +113030,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113047,7 +113047,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113063,7 +113063,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113080,7 +113080,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113096,7 +113096,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113113,7 +113113,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113129,7 +113129,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113146,7 +113146,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113162,7 +113162,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113179,7 +113179,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113195,7 +113195,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113212,7 +113212,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113228,7 +113228,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113245,7 +113245,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113261,7 +113261,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113278,7 +113278,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113294,7 +113294,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113311,7 +113311,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113327,7 +113327,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113344,7 +113344,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113360,7 +113360,7 @@ { "vpn": "openvpn", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -113377,7 +113377,7 @@ { "vpn": "wireguard", "country": "Israel", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Tel Aviv", "categories": [ "Standard VPN servers", @@ -122810,7 +122810,7 @@ { "vpn": "openvpn", "country": "Kenya", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Nairobi", "categories": [ "Standard VPN servers", @@ -122827,7 +122827,7 @@ { "vpn": "wireguard", "country": "Kenya", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Nairobi", "categories": [ "Standard VPN servers", @@ -122843,7 +122843,7 @@ { "vpn": "openvpn", "country": "Kenya", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Nairobi", "categories": [ "Standard VPN servers", @@ -122860,7 +122860,7 @@ { "vpn": "wireguard", "country": "Kenya", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Nairobi", "categories": [ "Standard VPN servers", @@ -123328,7 +123328,7 @@ { "vpn": "openvpn", "country": "Lebanon", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Beirut", "categories": [ "Standard VPN servers", @@ -123345,7 +123345,7 @@ { "vpn": "wireguard", "country": "Lebanon", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Beirut", "categories": [ "Standard VPN servers", @@ -123361,7 +123361,7 @@ { "vpn": "openvpn", "country": "Lebanon", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Beirut", "categories": [ "Standard VPN servers", @@ -123378,7 +123378,7 @@ { "vpn": "wireguard", "country": "Lebanon", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Beirut", "categories": [ "Standard VPN servers", @@ -126457,7 +126457,7 @@ { "vpn": "openvpn", "country": "Morocco", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Rabat", "categories": [ "Standard VPN servers", @@ -126474,7 +126474,7 @@ { "vpn": "wireguard", "country": "Morocco", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Rabat", "categories": [ "Standard VPN servers", @@ -126490,7 +126490,7 @@ { "vpn": "openvpn", "country": "Morocco", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Rabat", "categories": [ "Standard VPN servers", @@ -126507,7 +126507,7 @@ { "vpn": "wireguard", "country": "Morocco", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Rabat", "categories": [ "Standard VPN servers", @@ -134206,7 +134206,7 @@ { "vpn": "openvpn", "country": "Nigeria", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Lagos", "categories": [ "Standard VPN servers", @@ -134223,7 +134223,7 @@ { "vpn": "wireguard", "country": "Nigeria", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Lagos", "categories": [ "Standard VPN servers", @@ -134239,7 +134239,7 @@ { "vpn": "openvpn", "country": "Nigeria", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Lagos", "categories": [ "Standard VPN servers", @@ -134256,7 +134256,7 @@ { "vpn": "wireguard", "country": "Nigeria", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Lagos", "categories": [ "Standard VPN servers", @@ -145959,7 +145959,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -145976,7 +145976,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -145992,7 +145992,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146009,7 +146009,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146025,7 +146025,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146042,7 +146042,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146058,7 +146058,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146075,7 +146075,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146091,7 +146091,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146108,7 +146108,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146124,7 +146124,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146141,7 +146141,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146157,7 +146157,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146174,7 +146174,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146190,7 +146190,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146207,7 +146207,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146223,7 +146223,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146240,7 +146240,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146256,7 +146256,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146273,7 +146273,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146289,7 +146289,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146306,7 +146306,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146322,7 +146322,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146339,7 +146339,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146355,7 +146355,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146372,7 +146372,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146388,7 +146388,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146405,7 +146405,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146421,7 +146421,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146438,7 +146438,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146454,7 +146454,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146471,7 +146471,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146487,7 +146487,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146504,7 +146504,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146520,7 +146520,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146537,7 +146537,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146553,7 +146553,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146570,7 +146570,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146586,7 +146586,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146603,7 +146603,7 @@ { "vpn": "wireguard", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Standard VPN servers", @@ -146619,7 +146619,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Dedicated IP" @@ -146635,7 +146635,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Dedicated IP" @@ -146651,7 +146651,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Dedicated IP" @@ -146667,7 +146667,7 @@ { "vpn": "openvpn", "country": "South Africa", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Johannesburg", "categories": [ "Dedicated IP" @@ -160299,7 +160299,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160316,7 +160316,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160332,7 +160332,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160349,7 +160349,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160365,7 +160365,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160382,7 +160382,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160398,7 +160398,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160415,7 +160415,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160431,7 +160431,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160448,7 +160448,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160464,7 +160464,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160481,7 +160481,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160497,7 +160497,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160514,7 +160514,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160530,7 +160530,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160547,7 +160547,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160563,7 +160563,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160580,7 +160580,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160596,7 +160596,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160613,7 +160613,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160629,7 +160629,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160646,7 +160646,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160662,7 +160662,7 @@ { "vpn": "openvpn", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -160679,7 +160679,7 @@ { "vpn": "wireguard", "country": "Turkey", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Istanbul", "categories": [ "Standard VPN servers", @@ -161157,7 +161157,7 @@ { "vpn": "openvpn", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161174,7 +161174,7 @@ { "vpn": "wireguard", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161190,7 +161190,7 @@ { "vpn": "openvpn", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161207,7 +161207,7 @@ { "vpn": "wireguard", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161223,7 +161223,7 @@ { "vpn": "openvpn", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161240,7 +161240,7 @@ { "vpn": "wireguard", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161256,7 +161256,7 @@ { "vpn": "openvpn", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161273,7 +161273,7 @@ { "vpn": "wireguard", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161289,7 +161289,7 @@ { "vpn": "openvpn", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161306,7 +161306,7 @@ { "vpn": "wireguard", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161322,7 +161322,7 @@ { "vpn": "openvpn", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161339,7 +161339,7 @@ { "vpn": "wireguard", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161355,7 +161355,7 @@ { "vpn": "openvpn", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161372,7 +161372,7 @@ { "vpn": "wireguard", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161388,7 +161388,7 @@ { "vpn": "openvpn", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers", @@ -161405,7 +161405,7 @@ { "vpn": "wireguard", "country": "United Arab Emirates", - "region": "Africa, the Middle East and India", + "region": "Africa the Middle East and India", "city": "Dubai", "categories": [ "Standard VPN servers",