Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

ensure country in region code

Maxime-Ja34747578f85
diff --git a/src/lib/detect.ts b/src/lib/detect.ts
index 3b2f9021a..dab08312b 100644
--- a/src/lib/detect.ts
+++ b/src/lib/detect.ts
@@ -107,11 +107,16 @@ export async function getLocation(ip, req) {
const result = lookup.get(ip);
if (result) {
+ const country = result.country?.iso_code ?? result?.registered_country?.iso_code;
+ const subdivision1 = result.subdivisions?.[0]?.iso_code;
+ const subdivision2 = result.subdivisions?.[1]?.names?.en;
+ const city = result.city?.names?.en;
+
return {
- country: result.country?.iso_code ?? result?.registered_country?.iso_code,
- subdivision1: result.subdivisions?.[0]?.iso_code,
- subdivision2: result.subdivisions?.[1]?.names?.en,
- city: result.city?.names?.en,
+ country,
+ subdivision1: getRegionCode(country, subdivision1),
+ subdivision2,
+ city,
};
}
}