Fix url encoding

wow that was annoying
Cattn · Jul 30, 2024 · f576060 · f576060
1 parent 59b4bd9
commit f576060
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/app.html b/src/app.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html lang="en" data-theme="dark">
 	<head>
-		<meta charset="utf-8" />
+		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 		<!-- Google tag (gtag.js) -->
 		<script async src="https://www.googletagmanager.com/gtag/js?id=G-PS49ZXBGRW"></script>
 		<script>

diff --git a/src/routes/play/+page.svelte b/src/routes/play/+page.svelte
@@ -12,10 +12,12 @@
 
     if (browser) {
         const urlParams = new URLSearchParams(window.location.search);
-        game = urlParams.get("game");
+        game = decodeURIComponent(urlParams.get("game"));
         core = urlParams.get("core");
-        title = urlParams.get("title");
-        url = base + "/launch.html?core=" + core + "&game=" + game;
+        title = decodeURIComponent(urlParams.get("title"));
+        let endURL = encodeURIComponent(game)
+        url = base + "/launch.html?core=" + core + "&game=" + endURL;
+        console.log(url);
     }
 
     function toggleFullScreen() {

diff --git a/src/routes/singleplayer/+page.svelte b/src/routes/singleplayer/+page.svelte
@@ -61,7 +61,7 @@
             .then((data) => {
                 if (data.games) {
                     games[consoleName] = data.games;
-                    currentSrc = selectedConsole.source + "/" + selectedConsole.folder;
+                    currentSrc = selectedConsole.source + "" + selectedConsole.folder;
                     currentConsole = selectedConsole.core;
                 }
             })
@@ -148,7 +148,7 @@
             {#if games[selectedStatus.value] && games[selectedStatus.value].length > 0}
                 {#each games[selectedStatus.value] as game (game.file)}
                     {#if game.title.toLowerCase().includes(searchTerm.toLowerCase())}
-                        <a href="{base}/play?title={game.title}&core={currentConsole}&game={currentSrc}/{game.file}" class="group old-1 rounded-lg border px-4 py-4 shadow-sm hover:border-gray-400  hover:shadow-md focus-within:border-gray-500 focus-within:shadow-md">
+                        <a href="{base}/play?title={encodeURIComponent(game.title)}&core={currentConsole}&game={encodeURIComponent(`${currentSrc}/${game.file}`)}" class="group old-1 rounded-lg border px-4 py-4 shadow-sm hover:border-gray-400  hover:shadow-md focus-within:border-gray-500 focus-within:shadow-md">
                             <h2 class="text-lg font-bold mb-2">{game.title}</h2>
                             <p class="text-sm text-muted-foreground">{selectedStatus.label}</p>
                         </a>
@@ -162,7 +162,7 @@
                     {#if games[console.name] && games[console.name].length > 0}
                         {#each games[console.name] as game (game.file)}
                         {#if game.title.toLowerCase().includes(searchTerm.toLowerCase())}
-                            <a href="{base}/play?core={currentConsole}&game={currentSrc}/{game.file}" class="group old-1 rounded-lg border px-4 py-4 shadow-sm hover:border-gray-400  hover:shadow-md focus-within:border-gray-500 focus-within:shadow-md">
+                            <a href="{base}/play?core={currentConsole}&game={encodeURI(currentSrc)}/{encodeURI(game.file)}" class="group old-1 rounded-lg border px-4 py-4 shadow-sm hover:border-gray-400  hover:shadow-md focus-within:border-gray-500 focus-within:shadow-md">
                                 <h2 class="text-lg font-bold mb-2">{game.title}</h2>
                                 <p class="text-sm text-muted-foreground">{selectedStatus.label}</p>
                             </a>

diff --git a/static/launch.html b/static/launch.html
@@ -5,7 +5,7 @@
 </div>
 <script>
     const urlParams = new URLSearchParams(window.location.search);
-    game = urlParams.get("game");
+    game = decodeURIComponent(urlParams.get("game"));
     core = urlParams.get("core");
     window.EJS_player = '#game';
     window.EJS_core = core;