Lightless-Sync/LightlessServer
8
0
Fork 0
Code Issues 3 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into auto-prune-syncshell

Browse Source
This commit is contained in:
cake
2025-12-06 03:16:40 +01:00
parent 7e7a5808f4 00bcbbf8f4
commit 3218e800d6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
LightlessSyncServer/LightlessSyncAuthService/Services/GeoIPService.cs
View File

@@ -44,12 +44,14 @@ public class GeoIPService : IHostedService
if (_dbReader!.TryCity(ip, out var response)) if (_dbReader!.TryCity(ip, out var response))
{ {
string? continent = response?.Continent.Code; string? continent = response?.Continent.Code;
string? countryIso = response?.Country.IsoCode;
if (!string.IsNullOrEmpty(continent) && if (!string.IsNullOrEmpty(continent) &&
string.Equals(continent, "NA", StringComparison.Ordinal) string.Equals(continent, "NA", StringComparison.Ordinal)
&& response?.Location.Longitude != null) && response?.Location.Longitude != null)
{ {
if (response.Location.Longitude < -102) if (response.Location.Longitude < -102 &&
!string.Equals(countryIso, "CA", StringComparison.OrdinalIgnoreCase))
{ {
continent = "NA-W"; continent = "NA-W";
} }
@@ -57,6 +59,8 @@ public class GeoIPService : IHostedService
{ {
continent = "NA-E"; continent = "NA-E";
} }
_logger.LogDebug("Connecting {countryIso} to {continent}", countryIso, continent);
} }
return continent ?? "*"; return continent ?? "*";