SPAWNRYS/bloxstrap
1
0
Fork 0
mirror of https://github.com/bloxstraplabs/bloxstrap.git synced 2025-04-21 10:01:27 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Activity tracker, more efficient, fix city not IP

Browse Source
This commit is contained in:
pizzaboxer 2024-05-12 21:20:00 +01:00
parent 38edb68574
commit cda660cc3e
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
2 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Bloxstrap/Integrations/ActivityWatcher.cs
View File

@ -280,18 +280,27 @@
if (GeolocationCache.ContainsKey(ActivityMachineAddress)) if (GeolocationCache.ContainsKey(ActivityMachineAddress))
return GeolocationCache[ActivityMachineAddress]; return GeolocationCache[ActivityMachineAddress];
string location = "", locationCity = "", locationRegion = "", locationCountry = "";
try try
{ {
var locationInformation = await Http.GetJson<IPInfoResponse>($"https://ipinfo.io/{ActivityMachineAddress}/json"); string location = "";
var ipInfo = await Http.GetJson<IPInfoResponse>($"https://ipinfo.io/{ActivityMachineAddress}/json");
if (locationInformation is not null) if (ipInfo is null)
{ return $"N/A ({Resources.Strings.ActivityTracker_LookupFailed})";
locationCity = locationInformation.IP;
locationRegion = locationInformation.Region; if (string.IsNullOrEmpty(ipInfo.Country))
locationCountry = locationInformation.Country; location = "N/A";
} else if (ipInfo.City == ipInfo.Region)
location = $"{ipInfo.Region}, {ipInfo.Country}";
else
location = $"{ipInfo.City}, {ipInfo.Region}, {ipInfo.Country}";
if (!ActivityInGame)
return $"N/A ({Resources.Strings.ActivityTracker_LeftGame})";
GeolocationCache[ActivityMachineAddress] = location;
return location;
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -300,24 +309,6 @@
return $"N/A ({Resources.Strings.ActivityTracker_LookupFailed})"; return $"N/A ({Resources.Strings.ActivityTracker_LookupFailed})";
} }
locationCity = locationCity.ReplaceLineEndings("");
locationRegion = locationRegion.ReplaceLineEndings("");
locationCountry = locationCountry.ReplaceLineEndings("");
if (string.IsNullOrEmpty(locationCountry))
location = "N/A";
else if (locationCity == locationRegion)
location = $"{locationRegion}, {locationCountry}";
else
location = $"{locationCity}, {locationRegion}, {locationCountry}";
if (!ActivityInGame)
return $"N/A ({Resources.Strings.ActivityTracker_LeftGame})";
GeolocationCache[ActivityMachineAddress] = location;
return location;
} }
public void Dispose() public void Dispose()

4
Bloxstrap/Models/IPInfoResponse.cs
View File

@ -2,8 +2,8 @@ namespace Bloxstrap.Models
{ {
public class IPInfoResponse public class IPInfoResponse
{ {
[JsonPropertyName("ip")] [JsonPropertyName("city")]
public string IP { get; set; } = null!; public string City { get; set; } = null!;
[JsonPropertyName("country")] [JsonPropertyName("country")]
public string Country { get; set; } = null!; public string Country { get; set; } = null!;