From 30cb06bd0bbeca19e2da64859fceb2a8ec0acfc4 Mon Sep 17 00:00:00 2001
From: Daniel Bulant <danbulant@gmail.com>
Date: Wed, 10 Aug 2022 22:24:45 +0200
Subject: [PATCH] fix requests

---
 src/components/artList.svelte  |  2 +-
 src/pages/[manga]/index.svelte |  2 +-
 src/pages/index.svelte         | 10 ++++++----
 src/util/request.js            |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/artList.svelte b/src/components/artList.svelte
index 3b6858d..0da9040 100644
--- a/src/components/artList.svelte
+++ b/src/components/artList.svelte
@@ -14,7 +14,7 @@
         Loading art
     {:then list}
         {#each list.data.sort((a, b) => a.attributes.volume - b.attributes.volume) as item}
-            <img on:click={() => selectedImage = `https://cors-anywhere.danbulant.cloud/https://uploads.mangadex.org/covers/${mangaId}/${item.attributes.fileName}.512.jpg`} width=512 height=805 src="https://cors-anywhere.danbulant.cloud/https://uploads.mangadex.org/covers/{mangaId}/{item.attributes.fileName}.512.jpg" alt="" draggable={false}>
+            <img on:click={() => selectedImage = `https://uploads.mangadex.org/covers/${mangaId}/${item.attributes.fileName}.512.jpg`} width=512 height=805 src="https://uploads.mangadex.org/covers/{mangaId}/{item.attributes.fileName}.512.jpg" alt="" draggable={false}>
         {/each}
     {/await}
 </div>
diff --git a/src/pages/[manga]/index.svelte b/src/pages/[manga]/index.svelte
index 27b899f..9071cbd 100644
--- a/src/pages/[manga]/index.svelte
+++ b/src/pages/[manga]/index.svelte
@@ -306,7 +306,7 @@
 
     <div class="flex">
         {#if relationships.find(t => t.type === "cover_art")}
-            <img class="cover" class:r18={!["safe", "suggestive"].includes(manga.contentRating)} draggable="false" src="https://cors-anywhere.danbulant.cloud/https://uploads.mangadex.org/covers/{mangaId}/{relationships.find(t => t.type === "cover_art").attributes.fileName}.512.jpg" alt="" on:click={() => selectedImage = `https://cors-anywhere.danbulant.cloud/https://uploads.mangadex.org/covers/${mangaId}/${relationships.find(t => t.type === "cover_art").attributes.fileName}.512.jpg`}>
+            <img class="cover" class:r18={!["safe", "suggestive"].includes(manga.contentRating)} draggable="false" src="https://uploads.mangadex.org/covers/{mangaId}/{relationships.find(t => t.type === "cover_art").attributes.fileName}.512.jpg" alt="" on:click={() => selectedImage = `https://uploads.mangadex.org/covers/${mangaId}/${relationships.find(t => t.type === "cover_art").attributes.fileName}.512.jpg`}>
         {/if}
         <div class="info">
             {#if relationships.find(t => t.type === "author")}
diff --git a/src/pages/index.svelte b/src/pages/index.svelte
index 7c6847f..7cb93b5 100644
--- a/src/pages/index.svelte
+++ b/src/pages/index.svelte
@@ -6,7 +6,7 @@
 	import AnilistItems from "../components/anilistItems.svelte";
 	import ListOrGrid from "../components/listOrGrid.svelte";
 	import ratelimit from '../util/ratelimit';
-import MangadexItems from '../components/mangadexItems.svelte';
+	import MangadexItems from '../components/mangadexItems.svelte';
     
 	var name = $params.search;
     $: {
@@ -67,11 +67,13 @@ import MangadexItems from '../components/mangadexItems.svelte';
 	 */
 	async function scroll(e) {
 		if(scrollSearch !== null) return;
-		if(document.body.scrollHeight - window.scrollY - window.innerHeight < 800 && (await result).data.length < (await result).total) {
+		const resulted = await result;
+		if(!resulted || !resulted.data) return;
+		if(document.body.scrollHeight - window.scrollY - window.innerHeight < 800 && resulted.data.length < resulted.total) {
 			scrollSearch = name;
-			const res = await search(name, filters, (await result).data.length);
+			const res = await search(name, filters, resulted.data.length);
 			if(scrollSearch === name && res.data.length) {
-				(await result).data.push(...res.data);
+				resulted.data.push(...res.data);
 				result = result; // trigger reload
 			}
 			setTimeout(() => {
diff --git a/src/util/request.js b/src/util/request.js
index d146d12..2cc597c 100644
--- a/src/util/request.js
+++ b/src/util/request.js
@@ -2,7 +2,7 @@ export const proxy = "https://cors-anywhere.danbulant.cloud/";
 export const base = proxy + "https://api.mangadex.org/";
 
 function request(endpoint, query, type = "GET", body) {
-    return fetch(base + endpoint + encodeURIComponent(encodeURIComponent(query ? "?" + query.toString() : "")), {
+    return fetch(base + endpoint + ((query ? "?" + query.toString() : "")), {
         method: type,
         body: body ? JSON.stringify(body) : undefined
     }).then(resp => resp.json());