github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-20 13:24:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(ip-api): Add error handling and logging for freeipapi.com requests (#2006)

Browse source
This commit is contained in:
Roman Kelesidis 2025-06-24 12:55:41 +03:00
commit 12ce6e783e
No known key found for this signature in database
GPG key ID: D8157C4D4C4C6DB4
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/attach_mod/displaying_torrent.php
View file

@ -475,6 +475,8 @@ if ($tor_reged && $tor_info) {
if ($infoByIP = infoByIP((!empty($peer['ipv6']) ? $peer['ipv6'] : $peer['ip']), $peer['port'])) { if ($infoByIP = infoByIP((!empty($peer['ipv6']) ? $peer['ipv6'] : $peer['ip']), $peer['port'])) {
if (!empty($infoByIP['countryCode'])) { if (!empty($infoByIP['countryCode'])) {
$peerCountry = render_flag($infoByIP['countryCode'], false); $peerCountry = render_flag($infoByIP['countryCode'], false);
} else {
$peerCountry = $lang['NOT_AVAILABLE'];
} }
} }
} }

27
library/includes/functions.php
View file

@ -2210,19 +2210,26 @@ function infoByIP(string $ipAddress, int $port = 0): array
} }
$context = stream_context_create($contextOptions); $context = stream_context_create($contextOptions);
$response = file_get_contents($bb_cfg['ip2country_settings']['endpoint'] . $ipAddress, context: $context);
if ($response !== false) { try {
$json = json_decode($response, true); $response = file_get_contents($bb_cfg['ip2country_settings']['endpoint'] . $ipAddress, context: $context);
if (is_array($json) && !empty($json)) { if ($response !== false) {
$data = [ $json = json_decode($response, true);
'ipVersion' => $json['ipVersion'],
'countryCode' => $json['countryCode'], if (is_array($json) && !empty($json)) {
'continent' => $json['continent'], $data = [
'continentCode' => $json['continentCode'] 'ipVersion' => $json['ipVersion'],
]; 'countryCode' => $json['countryCode'],
'continent' => $json['continent'],
'continentCode' => $json['continentCode']
];
}
} else {
bb_log("[FreeIPAPI] Failed to get IP info for: $ipAddress");
} }
} catch (Exception $e) {
bb_log("[FreeIPAPI] " . $e->getMessage());
} }
if (empty($data)) { if (empty($data)) {