Merge pull request #175 from Suwayomi/main

latestReadChapter > lastReadChapter
Suwayomi · Mar 12, 2024 · e4cfd48 · e4cfd48
2 parents 9be5432 + cdf5484
commit e4cfd48
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 155 deletions.
diff --git a/src/gql/Fragments.gql b/src/gql/Fragments.gql
@@ -50,9 +50,6 @@ fragment MangaTypeFragment on MangaType {
 	latestUploadedChapter {
 		uploadDate
 	}
-	latestReadChapter {
-		lastReadAt
-	}
 	lastReadChapter {
 		lastReadAt
 	}

diff --git a/src/gql/Queries.gql b/src/gql/Queries.gql
@@ -31,7 +31,7 @@ query category($id: Int!) {
 				latestUploadedChapter {
 					uploadDate
 				}
-				latestReadChapter {
+				lastReadChapter {
 					lastReadAt
 				}
 				chapters {

diff --git a/src/lib/gql/Fragments.ts b/src/lib/gql/Fragments.ts
@@ -63,10 +63,6 @@ export const MangaTypeFragment = graphql(
 				uploadDate
 				id
 			}
-			latestReadChapter {
-				lastReadAt
-				id
-			}
 			lastReadChapter {
 				lastReadAt
 				id

diff --git a/src/lib/gql/Mutations.ts b/src/lib/gql/Mutations.ts
@@ -102,7 +102,7 @@ export const updateMangas = graphql(
 						uploadDate
 						id
 					}
-					latestReadChapter {
+					lastReadChapter {
 						lastReadAt
 						id
 					}

diff --git a/src/lib/gql/Queries.ts b/src/lib/gql/Queries.ts
@@ -50,7 +50,7 @@ export const getCategory = graphql(
 							uploadDate
 							id
 						}
-						latestReadChapter {
+						lastReadChapter {
 							lastReadAt
 							id
 						}

diff --git a/src/lib/gql/graphqlClient.ts b/src/lib/gql/graphqlClient.ts
@@ -313,7 +313,7 @@ function updateMangaCategoriesUpdater(
 			unreadCount: dat.manga.unreadCount ?? 0,
 			downloadCount: dat.manga.downloadCount ?? 0,
 			latestFetchedChapter: dat.manga.latestFetchedChapter,
-			latestReadChapter: dat.manga.latestReadChapter,
+			lastReadChapter: dat.manga.lastReadChapter,
 			latestUploadedChapter: dat.manga.latestUploadedChapter,
 			trackRecords: dat.manga.trackRecords,
 			chapters: dat.manga.chapters ?? {

diff --git a/src/routes/(app)/(library)/+page.svelte b/src/routes/(app)/(library)/+page.svelte
@@ -138,8 +138,8 @@
 				break;
 			case sort['Latest Read']:
 				tru =
-					parseInt(a.latestReadChapter?.lastReadAt ?? '0') >
-					parseInt(b.latestReadChapter?.lastReadAt ?? '0');
+					parseInt(a.lastReadChapter?.lastReadAt ?? '0') >
+					parseInt(b.lastReadChapter?.lastReadAt ?? '0');
 				break;
 			case sort['Latest Fetched']:
 				tru =

diff --git a/src/routes/(app)/manga/[MangaID]/(manga)/MangaCatagoryModal.svelte b/src/routes/(app)/manga/[MangaID]/(manga)/MangaCatagoryModal.svelte
@@ -45,139 +45,6 @@
 		);
 	}
 
-	// function updateMangaCategoriesUpdate(
-	// 	cache: ApolloCache<unknown>,
-	// 	{ data }: Omit<FetchResult<UpdateMangaCategoriesMutation>, 'context'>
-	// ): void {
-	// 	if (!data?.updateMangaCategories.manga.categories.nodes) return;
-	// 	const nodes = data.updateMangaCategories.manga.categories.nodes;
-
-	// 	const errors: Error[] = [];
-
-	// 	//// update this mangas categories
-	// 	try {
-	// 		const magna = structuredClone(manga);
-	// 		magna.categories.nodes = nodes;
-
-	// 		cache.writeQuery({
-	// 			query: GetMangaDoc,
-	// 			variables: { id: manga.id },
-	// 			data: { manga: magna }
-	// 		});
-	// 	} catch (e) {
-	// 		if (e instanceof Error) errors.push(e);
-	// 	}
-
-	// 	//// update the categories in library
-	// 	try {
-	// 		const oldNodes = manga.categories.nodes;
-	// 		if (!oldNodes) return;
-	// 		try {
-	// 			const currentManga: CategoryQuery['category']['mangas']['nodes'][0] = {
-	// 				id: manga.id,
-	// 				title: manga.title,
-	// 				inLibrary: manga.inLibrary,
-	// 				thumbnailUrl: manga.thumbnailUrl,
-	// 				unreadCount: manga.unreadCount,
-	// 				downloadCount: manga.downloadCount,
-	// 				latestFetchedChapter: manga.latestFetchedChapter,
-	// 				latestReadChapter: manga.latestReadChapter,
-	// 				latestUploadedChapter: manga.latestUploadedChapter,
-	// 				chapters: manga.chapters
-	// 			};
-	// 			// add to categories that now have it
-	// 			nodes.forEach((newNode) => {
-	// 				if (oldNodes.find((oldNode) => oldNode.id === newNode.id)) return;
-	// 				try {
-	// 					const categoryData = structuredClone(
-	// 						cache.readQuery<CategoryQuery>({
-	// 							query: CategoryDoc,
-	// 							variables: { id: newNode.id }
-	// 						})
-	// 					);
-	// 					if (!categoryData) return;
-	// 					categoryData.category.mangas.nodes.push(currentManga);
-
-	// 					cache.writeQuery({
-	// 						query: CategoryDoc,
-	// 						variables: { id: newNode.id },
-	// 						data: categoryData
-	// 					});
-	// 				} catch {}
-	// 			});
-	// 			// add to 0 if now in default
-	// 			if (nodes.length === 0 && oldNodes.length > 0) {
-	// 				try {
-	// 					const categoryData = structuredClone(
-	// 						cache.readQuery<CategoryQuery>({
-	// 							query: CategoryDoc,
-	// 							variables: { id: 0 }
-	// 						})
-	// 					);
-	// 					if (!categoryData) return;
-	// 					categoryData.category.mangas.nodes.push(currentManga);
-
-	// 					cache.writeQuery({
-	// 						query: CategoryDoc,
-	// 						variables: { id: 0 },
-	// 						data: categoryData
-	// 					});
-	// 				} catch {}
-	// 			}
-	// 		} catch {}
-
-	// 		//remove from categories that no longer have it
-	// 		oldNodes.forEach((oldNode) => {
-	// 			if (nodes.find((newNode) => oldNode.id === newNode.id)) return;
-	// 			try {
-	// 				const categoryData = structuredClone(
-	// 					cache.readQuery<CategoryQuery>({
-	// 						query: CategoryDoc,
-	// 						variables: { id: oldNode.id }
-	// 					})
-	// 				);
-	// 				if (!categoryData) return;
-	// 				categoryData.category.mangas.nodes = categoryData.category.mangas.nodes.filter(
-	// 					(e) => e.id !== manga.id
-	// 				);
-
-	// 				cache.writeQuery({
-	// 					query: CategoryDoc,
-	// 					variables: { id: oldNode.id },
-	// 					data: categoryData
-	// 				});
-	// 			} catch {}
-	// 		});
-	// 		// remove from 0 if no longer in default
-	// 		if (oldNodes.length === 0 && nodes.length > 0) {
-	// 			//remove from default
-	// 			try {
-	// 				const categoryData = structuredClone(
-	// 					cache.readQuery<CategoryQuery>({
-	// 						query: CategoryDoc,
-	// 						variables: { id: 0 }
-	// 					})
-	// 				);
-	// 				if (!categoryData) return;
-	// 				categoryData.category.mangas.nodes = categoryData.category.mangas.nodes.filter(
-	// 					(e) => e.id !== manga.id
-	// 				);
-
-	// 				cache.writeQuery({
-	// 					query: CategoryDoc,
-	// 					variables: { id: 0 },
-	// 					data: categoryData
-	// 				});
-	// 			} catch {}
-	// 		}
-	// 	} catch {}
-
-	// 	if (errors.length > 0) {
-	// 		console.error(errors);
-	// 		throw new Error('check console');
-	// 	}
-	// }
-
 	async function handelSubmit() {
 		modalStore.close();
 		if (
@@ -193,14 +60,6 @@
 						clear: true
 					})
 					.toPromise()
-				// updateMangaCategories({
-				// 	variables: {
-				// 		id: manga.id,
-				// 		addTo: selectedCategories,
-				// 		clear: true
-				// 	},
-				// 	update: updateMangaCategoriesUpdate
-				// })
 			);
 		}
 	}

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