watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-18 19:45:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat(customize-header): fix mistake customize header

Browse source
This commit is contained in:
Thomas-xDo 2025-06-13 10:58:42 +07:00
parent 7904a27e77
commit 710850729f
1 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/lib/detect.ts
View file

@ -88,17 +88,29 @@ export async function getLocation(ip: string, req: NextApiRequestCollect) {
envHeaders.country && envHeaders.country &&
envHeaders.region && envHeaders.region &&
envHeaders.city && envHeaders.city &&
envHeaders.lat &&
envHeaders.lng &&
req.headers[envHeaders.country] && req.headers[envHeaders.country] &&
req.headers[envHeaders.region] && req.headers[envHeaders.region] &&
req.headers[envHeaders.city]; req.headers[envHeaders.city] &&
req.headers[envHeaders.lat] &&
req.headers[envHeaders.lng];
if (hasCustomHeaders) { if (hasCustomHeaders) {
log('Use custom headers');
const country = safeDecodeURIComponent(req.headers[envHeaders.country]);
const subdivision1Raw = safeDecodeURIComponent(req.headers[envHeaders.region]);
const city = safeDecodeURIComponent(req.headers[envHeaders.city]);
const lat = parseFloat(safeDecodeURIComponent(req.headers[envHeaders.lat]));
const lng = parseFloat(safeDecodeURIComponent(req.headers[envHeaders.lng]));
return { return {
country: safeDecodeURIComponent(req.headers[envHeaders.country]), country,
subdivision1: safeDecodeURIComponent(req.headers[envHeaders.region]), subdivision1: getRegionCode(country, subdivision1Raw),
city: safeDecodeURIComponent(req.headers[envHeaders.city]), city,
lat: safeDecodeURIComponent(req.headers[envHeaders.lat]), lat,
lng: safeDecodeURIComponent(req.headers[envHeaders.lng]), lng,
}; };
} }