fix: don't decode queries containing %

Crissium · Oct 25, 2023 · 609377a · 609377a
1 parent dff4990
commit 609377a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/client/src/DesktopApp.js b/client/src/DesktopApp.js
@@ -63,7 +63,7 @@ export default function DesktopApp() {
 			.then((data) => {
 				setHistory(data);
 			});
-		
+
 		fetch(`${API_PREFIX}/management/history_size`)
 			.then(loadDataFromJsonResponse)
 			.then((data) => {
@@ -132,9 +132,15 @@ export default function DesktopApp() {
 			return;
 		}
 
-		newQuery = decodeURIComponent(newQuery);
-		setQuery(newQuery);
-		newQuery = encodeURIComponent(newQuery);
+		try {
+			newQuery = decodeURIComponent(newQuery); 
+			setQuery(newQuery);
+			newQuery = encodeURIComponent(newQuery);
+		}
+		catch (error) {
+			setQuery(newQuery);
+			newQuery = encodeURIComponent(newQuery);
+		}
 
 		// Clean up previous scripts to avoid potential conflicts and DOM tree clutter
 		const scripts = document.querySelectorAll('script');

diff --git a/client/src/MobileApp.js b/client/src/MobileApp.js
@@ -132,9 +132,15 @@ export default function MobileApp() {
 			return;
 		}
 
-		newQuery = decodeURIComponent(newQuery);
-		setQuery(newQuery);
-		newQuery = encodeURIComponent(newQuery);
+		try {
+			newQuery = decodeURIComponent(newQuery);
+			setQuery(newQuery);
+			newQuery = encodeURIComponent(newQuery);
+		}
+		catch (error) {
+			setQuery(newQuery);
+			newQuery = encodeURIComponent(newQuery);
+		}
 
 		// Clean up previous scripts to avoid potential conflicts and DOM tree clutter
 		const scripts = document.querySelectorAll('script');