m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2024-06-28 00:37:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ensure region code includes country.

Browse Source
This commit is contained in:
Mike Cao 2023-08-27 22:36:37 -07:00
parent 5b3a598593
commit 4b0118dce1
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/detect.ts
View File

@ -65,19 +65,27 @@ export async function getLocation(ip, req) {
// Cloudflare headers
if (req.headers['cf-ipcountry']) {
const country = safeDecodeURIComponent(req.headers['cf-ipcountry']);
const subdivision1 = safeDecodeURIComponent(req.headers['cf-region-code']);
const city = safeDecodeURIComponent(req.headers['cf-ipcity']);
return {
country: safeDecodeURIComponent(req.headers['cf-ipcountry']),
subdivision1: safeDecodeURIComponent(req.headers['cf-region-code']),
city: safeDecodeURIComponent(req.headers['cf-ipcity']),
country,
subdivision1: subdivision1.includes('-') ? subdivision1 : `${country}-${subdivision1}`,
city,
};
}
// Vercel headers
if (req.headers['x-vercel-ip-country']) {
const country = safeDecodeURIComponent(req.headers['x-vercel-ip-country']);
const subdivision1 = safeDecodeURIComponent(req.headers['x-vercel-ip-country-region']);
const city = safeDecodeURIComponent(req.headers['x-vercel-ip-city']);
return {
country: safeDecodeURIComponent(req.headers['x-vercel-ip-country']),
subdivision1: safeDecodeURIComponent(req.headers['x-vercel-ip-country-region']),
city: safeDecodeURIComponent(req.headers['x-vercel-ip-city']),
country,
subdivision1: subdivision1.includes('-') ? subdivision1 : `${country}-${subdivision1}`,
city,
};
}