Merge pull request #164 from Suwayomi/main

fix tracking authentication
Suwayomi · Mar 1, 2024 · b843919 · b843919
2 parents 5c7def2 + 9479817
commit b843919
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 45 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -7,7 +7,7 @@ node_modules
 .env.*
 !.env.example
 
-/src/lib/generated.ts
+/src/graphql-env.d.ts
 
 # Ignore files for PNPM, NPM and YARN
 pnpm-lock.yaml

diff --git a/.prettierignore b/.prettierignore
@@ -7,7 +7,7 @@ node_modules
 .env.*
 !.env.example
 
-/src/lib/generated.ts
+/src/graphql-env.d.ts
 
 # Ignore files for PNPM, NPM and YARN
 pnpm-lock.yaml

diff --git a/src/graphql-env.d.ts b/src/graphql-env.d.ts
@@ -15524,7 +15524,7 @@ export type introspection = {
 import * as gqlTada from 'gql.tada';
 
 declare module 'gql.tada' {
-	interface setupSchema {
-		introspection: introspection;
-	}
-}
+  interface setupSchema {
+    introspection: introspection
+  }
+}
diff --git a/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+page.svelte b/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+page.svelte
@@ -581,11 +581,13 @@
 			<IntersectionObserver
 				on:intersect={(e) => {
 					if (e.detail) {
-						client.mutation(updateChapter, {
-							id: chapter.chapterID,
-							lastPageRead: chapter.pages.length,
-							isRead: true
-						});
+						client
+							.mutation(updateChapter, {
+								id: chapter.chapterID,
+								lastPageRead: chapter.pages.length,
+								isRead: true
+							})
+							.toPromise();
 						LoadNextChapter(currentChapterID);
 					}
 				}}

diff --git a/src/routes/(app)/settings/categories/+page.svelte b/src/routes/(app)/settings/categories/+page.svelte
@@ -94,34 +94,42 @@
 		switch (movement) {
 			case Movement.top:
 				if (cat.order !== 1) {
-					client.mutation(updateCategoryOrder, {
-						id: cat.id,
-						position: 1
-					});
+					client
+						.mutation(updateCategoryOrder, {
+							id: cat.id,
+							position: 1
+						})
+						.toPromise();
 				}
 				break;
 			case Movement.up:
 				if (cat.order !== 1) {
-					client.mutation(updateCategoryOrder, {
-						id: cat.id,
-						position: cat.order - 1
-					});
+					client
+						.mutation(updateCategoryOrder, {
+							id: cat.id,
+							position: cat.order - 1
+						})
+						.toPromise();
 				}
 				break;
 			case Movement.down:
 				if (cat.order !== $cats.data.categories.nodes.length - 1) {
-					client.mutation(updateCategoryOrder, {
-						id: cat.id,
-						position: cat.order + 1
-					});
+					client
+						.mutation(updateCategoryOrder, {
+							id: cat.id,
+							position: cat.order + 1
+						})
+						.toPromise();
 				}
 				break;
 			default:
 				if (cat.order !== $cats.data?.categories.nodes.length - 1) {
-					client.mutation(updateCategoryOrder, {
-						id: cat.id,
-						position: $cats.data.categories.nodes.length - 1
-					});
+					client
+						.mutation(updateCategoryOrder, {
+							id: cat.id,
+							position: $cats.data.categories.nodes.length - 1
+						})
+						.toPromise();
 				}
 				break;
 		}

diff --git a/src/routes/(app)/settings/categories/CategoriesEditModal.svelte b/src/routes/(app)/settings/categories/CategoriesEditModal.svelte
@@ -26,13 +26,15 @@
 	const client = getContextClient();
 
 	function submitChange(): void {
-		client.mutation(updateCategory, {
-			id: cat.id,
-			name: catinput,
-			default: Defaul,
-			includeInDownload: includeInDownload ? 'INCLUDE' : 'EXCLUDE',
-			includeInUpdate: includeInUpdate ? 'INCLUDE' : 'EXCLUDE'
-		});
+		client
+			.mutation(updateCategory, {
+				id: cat.id,
+				name: catinput,
+				default: Defaul,
+				includeInDownload: includeInDownload ? 'INCLUDE' : 'EXCLUDE',
+				includeInUpdate: includeInUpdate ? 'INCLUDE' : 'EXCLUDE'
+			})
+			.toPromise();
 		parent.onClose();
 	}
 </script>

diff --git a/src/routes/(app)/settings/categories/CategoriesNewModal.svelte b/src/routes/(app)/settings/categories/CategoriesNewModal.svelte
@@ -24,12 +24,14 @@
 
 	const client = getContextClient();
 	async function submitChange(): Promise<void> {
-		client.mutation(createCategory, {
-			name: catinput,
-			default: Defaul,
-			includeInDownload: includeInDownload ? 'INCLUDE' : 'INCLUDE',
-			includeInUpdate: includeInUpdate ? 'INCLUDE' : 'INCLUDE'
-		});
+		client
+			.mutation(createCategory, {
+				name: catinput,
+				default: Defaul,
+				includeInDownload: includeInDownload ? 'INCLUDE' : 'INCLUDE',
+				includeInUpdate: includeInUpdate ? 'INCLUDE' : 'INCLUDE'
+			})
+			.toPromise();
 		parent.onClose();
 	}
 </script>

diff --git a/src/routes/trackers/auth/+page.svelte b/src/routes/trackers/auth/+page.svelte
@@ -17,10 +17,12 @@
 		const state: { trackerId: number } = JSON.parse(
 			url.searchParams.get('state') ?? '{}'
 		);
-		client.mutation(loginTrackerOAuth, {
-			callbackUrl: url.href,
-			trackerId: state.trackerId
-		});
+		await client
+			.mutation(loginTrackerOAuth, {
+				callbackUrl: url.href,
+				trackerId: state.trackerId
+			})
+			.toPromise();
 		localStorage.setItem('VUI3_TRACKER_LOGIN', 'true');
 		window.close();
 	}

diff --git a/versionToServerVersionMapping.json b/versionToServerVersionMapping.json
@@ -5,7 +5,7 @@
 	},
 	{
 		"tag": "v1.0.0",
-		"uiVersion": "r551",
+		"uiVersion": "r560",
 		"serverVersion": "r1498"
 	}
 ]