ritascarlet/Telegraph-Images
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ipregion.sh

Browse Source
This commit is contained in:
kurushmal
2025-12-06 04:59:46 -08:00
committed by GitHub
parent 37fd289e14
commit b08b3e4651
1 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ipregion.sh
+17 -32
View File
@@ -924,47 +924,32 @@ get_registered_country() {
get_server_country() { get_server_country() {
local ip_version="$1" local ip_version="$1"
local response country_code country_name local response country_code
# Используем Cloudflare как основной источник (быстрый и надежный) # 1. ipapi.co — самый стабильный и не ебет мозг
response=$(make_request GET "https://speed.cloudflare.com/meta" --ip-version "$ip_version") response=$(make_request GET "https://ipapi.co/json" --ip-version "$ip_version")
country_code=$(process_json "$response" ".country_code")
if [[ -n "$response" && "$response" != *"error"* ]]; then
country_code=$(process_json "$response" ".country") if [[ -n "$country_code" && "$country_code" != "null" ]]; then
if [[ -n "$country_code" && "$country_code" != "null" ]]; then echo "$country_code"
echo "$country_code" return
return
fi
fi fi
# Если Cloudflare не сработал, пробуем MaxMind # 2. MaxMind — fallback
response=$(make_request GET "https://geoip.maxmind.com/geoip/v2.1/city/me" \ response=$(make_request GET "https://geoip.maxmind.com/geoip/v2.1/city/me" \
--header "Referer: https://www.maxmind.com" \ --header "Referer: https://www.maxmind.com" \
--ip-version "$ip_version") --ip-version "$ip_version")
country_code=$(process_json "$response" ".country.iso_code")
if [[ -n "$response" && "$response" != *"error"* ]]; then
country_code=$(process_json "$response" ".country.iso_code") if [[ -n "$country_code" && "$country_code" != "null" ]]; then
if [[ -n "$country_code" && "$country_code" != "null" ]]; then echo "$country_code"
echo "$country_code" return
return
fi
fi fi
# Если и MaxMind не сработал, пробуем IPAPI.co
response=$(make_request GET "https://ipapi.co/json" --ip-version "$ip_version")
if [[ -n "$response" && "$response" != *"error"* ]]; then
country_code=$(process_json "$response" ".country_code")
if [[ -n "$country_code" && "$country_code" != "null" ]]; then
echo "$country_code"
return
fi
fi
# Если ничего не сработало
echo "Unknown" echo "Unknown"
} }
get_iata_location() { get_iata_location() {
local iata_code="$1" local iata_code="$1"
local url="https://www.air-port-codes.com/api/v1/single" local url="https://www.air-port-codes.com/api/v1/single"
@@ -1997,7 +1982,7 @@ main() {
discover_external_ips discover_external_ips
get_asn get_asn
# Определяем страну сервера # Определяем страну сервера
if [[ -n "$EXTERNAL_IPV4" ]]; then if [[ -n "$EXTERNAL_IPV4" ]]; then
SERVER_COUNTRY=$(get_server_country 4) SERVER_COUNTRY=$(get_server_country 4)
@@ -2006,7 +1991,7 @@ main() {
else else
SERVER_COUNTRY="Unknown" SERVER_COUNTRY="Unknown"
fi fi
log "$LOG_INFO" "Server country detected: $SERVER_COUNTRY" log "$LOG_INFO" "Server country detected: $SERVER_COUNTRY"
case "$GROUPS_TO_SHOW" in case "$GROUPS_TO_SHOW" in