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.

Merge branch 'dev' of https://github.com/umami-software/umami into feat/add-segments

Francis Cao1ccc8a1a863b
diff --cc src/app/api/send/route.ts
index 60d6f7af0,65c88a285..62212b5f1
--- a/src/app/api/send/route.ts
+++ b/src/app/api/send/route.ts
@@@ -145,7 -145,7 +145,8 @@@ export async function POST(request: Req
const base = hostname ? `https://${hostname}` : 'https://localhost';
const currentUrl = new URL(url, base);
- let urlPath = currentUrl.pathname === '/undefined' ? '' : currentUrl.pathname;
- let urlPath = currentUrl.pathname === '/undefined' ? '' : currentUrl.pathname + currentUrl.hash;
++ let urlPath =
++ currentUrl.pathname === '/undefined' ? '' : currentUrl.pathname + currentUrl.hash;
const urlQuery = currentUrl.search.substring(1);
const urlDomain = currentUrl.hostname.replace(/^www./, '');
diff --cc src/lib/detect.ts
index a023d27d2,99c101abd..00f42b420
--- a/src/lib/detect.ts
+++ b/src/lib/detect.ts
@@@ -124,7 -124,7 +124,9 @@@ export async function getLocation(ip: s
if (!global[MAXMIND]) {
const dir = path.join(process.cwd(), 'geo');
- global[MAXMIND] = await maxmind.open(path.resolve(dir, 'GeoLite2-City.mmdb'));
- global[MAXMIND] = await maxmind.open(process.env.GEOLITE_DB_PATH || path.resolve(dir, 'GeoLite2-City.mmdb'));
++ global[MAXMIND] = await maxmind.open(
++ process.env.GEOLITE_DB_PATH || path.resolve(dir, 'GeoLite2-City.mmdb'),
++ );
}
const result = global[MAXMIND].get(ip);