watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-06 21:57:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' into jajaja

Browse source 
# Conflicts:
#	package.json
#	pnpm-lock.yaml
#	src/lib/detect.ts
This commit is contained in:
Mike Cao 2025-07-08 18:45:02 -07:00
commit 5ed1d710cb
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/detect.ts
View file

@ -130,7 +130,7 @@ export async function getLocation(ip: string = '', headers: Headers, hasPayloadI
);
}
const result = globalThis[MAXMIND].get(ip);
const result = globalThis[MAXMIND].get(ip?.split(':')[0]);
if (result) {
const country = result.country?.iso_code ?? result?.registered_country?.iso_code;

1
src/tracker/index.js
View file

@ -150,6 +150,7 @@
try {
const res = await fetch(endpoint, {
keepalive: true,
method: 'POST',
body: JSON.stringify({ type, payload }),
headers: {