From b92de5c112c1e63464936d6f0bcf1718544d301d Mon Sep 17 00:00:00 2001
From: Bradley Shellnut <bradleyshellnut@pm.me>
Date: Tue, 14 Feb 2023 17:56:07 -0800
Subject: [PATCH] Fix import max pages and error name conflict.

---
 src/routes/api/articles/+server.ts         | 12 +++++++-----
 src/routes/articles/[page]/+page.server.ts |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/routes/api/articles/+server.ts b/src/routes/api/articles/+server.ts
index 572118c..02ebf6a 100644
--- a/src/routes/api/articles/+server.ts
+++ b/src/routes/api/articles/+server.ts
@@ -1,14 +1,16 @@
 import { json, error } from '@sveltejs/kit';
+import { WALLABAG_MAX_PAGES } from '$env/static/private';
 import type { RequestHandler, RequestEvent } from './$types';
 import { fetchArticlesApi } from '$root/routes/api';
 
 export const GET: RequestHandler = async ({ url, setHeaders }: RequestEvent) => {
 	try {
-		if (+url?.searchParams?.get('page') > WALLABAG_MAX_PAGES) {
+		const page = url?.searchParams?.get('page') || '1';
+		if (+page > +WALLABAG_MAX_PAGES) {
 			throw new Error('Page does not exist');
 		}
 		const response = await fetchArticlesApi('get', `fetchArticles`, {
-			page: url?.searchParams?.get('page') || '1'
+			page
 		});
 
 		if (response?.articles) {
@@ -26,8 +28,8 @@ export const GET: RequestHandler = async ({ url, setHeaders }: RequestEvent) =>
 
 			return json(response);
 		}
-	} catch (error) {
-		console.error(error);
-		throw error(error);
+	} catch (e) {
+		console.error(e);
+		throw error(404, 'Page does not exist');
 	}
 };
diff --git a/src/routes/articles/[page]/+page.server.ts b/src/routes/articles/[page]/+page.server.ts
index 57bb73c..36b3c1a 100644
--- a/src/routes/articles/[page]/+page.server.ts
+++ b/src/routes/articles/[page]/+page.server.ts
@@ -13,7 +13,7 @@ export type ArticlePageLoad = {
 
 export const load: PageServerLoad = async ({ fetch, params }) => {
 	const { page } = params;
-	if (+page > WALLABAG_MAX_PAGES) {
+	if (+page > +WALLABAG_MAX_PAGES) {
 		throw error(404, {
 			message: 'Not found'
 		});