Merge pull request #231 from Suwayomi/main

fix for notdk
Suwayomi · Sep 23, 2024 · f3f3886 · f3f3886
2 parents 175394c + 4b4b891
commit f3f3886
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/src/lib/simpleStores.ts b/src/lib/simpleStores.ts
@@ -75,7 +75,7 @@ const mangaMetaDefaults = {
 	doPageIndicator: false,
 	notes: '',
 	showMissingChapters: false,
-	groupPartials: [] as string[]
+	groupPartials: [] as string[] | undefined
 };
 type mangaMeta = typeof mangaMetaDefaults;
 

diff --git a/src/routes/(app)/manga/[MangaID]/(manga)/ChaptersFilterModal.svelte b/src/routes/(app)/manga/[MangaID]/(manga)/ChaptersFilterModal.svelte
@@ -115,9 +115,10 @@
 											.split(',')
 											.map((a) => a.trim())
 											.filter((a) => a.length > 0);
-										e.currentTarget.value = $mangaMeta.groupPartials.join(',');
+										e.currentTarget.value =
+											$mangaMeta.groupPartials?.join(',') ?? '';
 									}}
-									value={$mangaMeta.groupPartials.join(',')}
+									value={$mangaMeta.groupPartials?.join(',') ?? ''}
 									class="input w-1/2"
 									type="text"
 									placeholder="asura,dex,..."

diff --git a/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/[email protected] b/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/[email protected]
@@ -10,7 +10,7 @@
 	import IconButton from '$lib/components/IconButton.svelte';
 	import { getDrawerStore, AppShell } from '@skeletonlabs/skeleton';
 	import type { LayoutData } from './$types';
-	import { get, writable, type Writable } from 'svelte/store';
+	import { writable } from 'svelte/store';
 	import { makeToggleDrawer } from './chapterStores';
 
 	export let data: LayoutData;

diff --git a/src/routes/(app)/manga/[MangaID]/util.ts b/src/routes/(app)/manga/[MangaID]/util.ts
@@ -15,10 +15,11 @@ export function filterChapters(
 	return (
 		chapter: ResultOf<typeof getManga>['manga']['chapters']['nodes'][number]
 	) => {
-		if (get(mangaMeta).groupPartials.length > 0) {
+		const groupPartials = get(mangaMeta).groupPartials;
+		if (groupPartials && groupPartials.length > 0) {
 			if (
-				!get(mangaMeta)
-					.groupPartials.map((group) => {
+				!groupPartials
+					.map((group) => {
 						return chapter.scanlator
 							?.toLowerCase()
 							.includes(group.toLowerCase());

diff --git a/versionToServerVersionMapping.json b/versionToServerVersionMapping.json
@@ -5,7 +5,7 @@
 	},
 	{
 		"tag": "v1.1.0",
-		"uiVersion": "r1146",
+		"uiVersion": "r1149",
 		"serverVersion": "r1502",
 		"comment": "the server version is between 1.0.0 and 1.1.0 release",
 		"comment2": "because its the preview version that implemented the breaking changes"