From ebdd9095ab137f1e0497631bc8df099d4fc1c17e Mon Sep 17 00:00:00 2001
From: Exlaso <vedantbhavsar67@gmail.com>
Date: Fri, 30 May 2025 11:14:03 +0530
Subject: [PATCH 1/3] fix: decode location fields in user detection

---
 src/lib/detect.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/detect.ts b/src/lib/detect.ts
index a023d27d..4331a9a9 100644
--- a/src/lib/detect.ts
+++ b/src/lib/detect.ts
@@ -5,11 +5,11 @@ import ipaddr from 'ipaddr.js';
 import maxmind from 'maxmind';
 import {
   DESKTOP_OS,
-  MOBILE_OS,
   DESKTOP_SCREEN_WIDTH,
-  LAPTOP_SCREEN_WIDTH,
-  MOBILE_SCREEN_WIDTH,
   IP_ADDRESS_HEADERS,
+  LAPTOP_SCREEN_WIDTH,
+  MOBILE_OS,
+  MOBILE_SCREEN_WIDTH,
 } from './constants';
 
 const MAXMIND = 'maxmind';
@@ -146,9 +146,9 @@ export async function getClientInfo(request: Request, payload: Record<string, an
   const userAgent = payload?.userAgent || request.headers.get('user-agent');
   const ip = payload?.ip || getIpAddress(request.headers);
   const location = await getLocation(ip, request.headers, !!payload?.ip);
-  const country = location?.country;
-  const region = location?.region;
-  const city = location?.city;
+  const country = decodeURIComponent(location?.country);
+  const region = decodeURIComponent(location?.region);
+  const city = decodeURIComponent(location?.city);
   const browser = browserName(userAgent);
   const os = detectOS(userAgent) as string;
   const device = getDevice(payload?.screen, os);

From 0736289ce15b9100ac5d0e0a7d6297016e653e01 Mon Sep 17 00:00:00 2001
From: Exlaso <vedantbhavsar67@gmail.com>
Date: Fri, 30 May 2025 11:19:19 +0530
Subject: [PATCH 2/3] fix: handle unknown location fields in user detection

---
 src/lib/detect.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/detect.ts b/src/lib/detect.ts
index 4331a9a9..8712632a 100644
--- a/src/lib/detect.ts
+++ b/src/lib/detect.ts
@@ -146,9 +146,9 @@ export async function getClientInfo(request: Request, payload: Record<string, an
   const userAgent = payload?.userAgent || request.headers.get('user-agent');
   const ip = payload?.ip || getIpAddress(request.headers);
   const location = await getLocation(ip, request.headers, !!payload?.ip);
-  const country = decodeURIComponent(location?.country);
-  const region = decodeURIComponent(location?.region);
-  const city = decodeURIComponent(location?.city);
+  const country = decodeURIComponent(location?.country || 'UNKNOWN');
+  const region = decodeURIComponent(location?.region || 'UNKNOWN');
+  const city = decodeURIComponent(location?.city || 'UNKNOWN');
   const browser = browserName(userAgent);
   const os = detectOS(userAgent) as string;
   const device = getDevice(payload?.screen, os);

From bf94c5dc73d34b7efc7177b98ff9dcf48c5098f1 Mon Sep 17 00:00:00 2001
From: Exlaso <vedantbhavsar67@gmail.com>
Date: Wed, 4 Jun 2025 12:43:02 +0530
Subject: [PATCH 3/3] fix: use safeDecodeURIComponent for location fields in
 user detection

---
 src/lib/detect.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/lib/detect.ts b/src/lib/detect.ts
index 8712632a..2b1fe01d 100644
--- a/src/lib/detect.ts
+++ b/src/lib/detect.ts
@@ -11,6 +11,7 @@ import {
   MOBILE_OS,
   MOBILE_SCREEN_WIDTH,
 } from './constants';
+import { safeDecodeURIComponent } from '@/lib/url';
 
 const MAXMIND = 'maxmind';
 
@@ -146,9 +147,9 @@ export async function getClientInfo(request: Request, payload: Record<string, an
   const userAgent = payload?.userAgent || request.headers.get('user-agent');
   const ip = payload?.ip || getIpAddress(request.headers);
   const location = await getLocation(ip, request.headers, !!payload?.ip);
-  const country = decodeURIComponent(location?.country || 'UNKNOWN');
-  const region = decodeURIComponent(location?.region || 'UNKNOWN');
-  const city = decodeURIComponent(location?.city || 'UNKNOWN');
+  const country = safeDecodeURIComponent(location?.country);
+  const region = safeDecodeURIComponent(location?.region);
+  const city = safeDecodeURIComponent(location?.city);
   const browser = browserName(userAgent);
   const os = detectOS(userAgent) as string;
   const device = getDevice(payload?.screen, os);