fix: the logic for which exclusion setting takes precedence was backwards

ilyvion · ilyvion · commit 014b68a607fb · 2023-09-10T11:07:21.000+02:00
Fixes #36
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,7 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed 🐛
 
--   Don't show "last strip" button when said strip is the current strip
+-   Don't show "last strip" button in item navigation bar when said strip is the current strip
+-   The logic for which exclusion setting takes precedence was backwards, so if you had set both "skip non-canon comics" and "skip guest comics," it would only skip guest comics, but not non-canon comics. Fixes [#36](https://github.com/Questionable-Content-Extensions/client/issues/36)
 
 ## [1.0.0][] - 2023-09-09
 
diff --git a/src/store/api/comicApiSlice.ts b/src/store/api/comicApiSlice.ts
@@ -78,10 +78,10 @@ export const comicApiSlice = apiSlice.injectEndpoints({
                 if (editModeToken) {
                     urlParameters.token = editModeToken
                 }
-                if (skipGuest) {
-                    urlParameters.exclude = 'guest'
-                } else if (skipNonCanon) {
+                if (skipNonCanon) {
                     urlParameters.exclude = 'non-canon'
+                } else if (skipGuest) {
+                    urlParameters.exclude = 'guest'
                 }
                 if (showAllMembers || editModeToken) {
                     urlParameters.include = 'all'

Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,10 @@ export const comicApiSlice = apiSlice.injectEndpoints({`
`78`	`78`	`if (editModeToken) {`
`79`	`79`	`urlParameters.token = editModeToken`
`80`	`80`	`}`
`81`		`- if (skipGuest) {`
`82`		`- urlParameters.exclude = 'guest'`
`83`		`- } else if (skipNonCanon) {`
	`81`	`+ if (skipNonCanon) {`
`84`	`82`	`urlParameters.exclude = 'non-canon'`
	`83`	`+ } else if (skipGuest) {`
	`84`	`+ urlParameters.exclude = 'guest'`
`85`	`85`	`}`
`86`	`86`	`if (showAllMembers \|\| editModeToken) {`
`87`	`87`	`urlParameters.include = 'all'`