From 2a9f41c7015a33f056b673cc15aabe8406a1b48b Mon Sep 17 00:00:00 2001
From: Bradley Shellnut <bradleyshellnut@protonmail.com>
Date: Thu, 30 May 2024 12:34:50 -0700
Subject: [PATCH] Updating sitemap.

---
 src/lib/api.ts                             | 3 +--
 src/routes/api/articles/+server.ts         | 5 +----
 src/routes/articles/[page]/+page.server.ts | 5 -----
 src/routes/sitemap.xml/+server.ts          | 7 +++++--
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/lib/api.ts b/src/lib/api.ts
index 5bb07fd..807291a 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -19,8 +19,7 @@ const base: string = WALLABAG_URL;
 export async function fetchArticlesApi(
 	method: string,
 	resource: string,
-	queryParams: Record<string, string>,
-	data?: Record<string, unknown>
+	queryParams: Record<string, string>
 ) {
 	let perPage = Number(queryParams?.limit);
 	if (perPage > 30) {
diff --git a/src/routes/api/articles/+server.ts b/src/routes/api/articles/+server.ts
index 3c782f8..d0733b1 100644
--- a/src/routes/api/articles/+server.ts
+++ b/src/routes/api/articles/+server.ts
@@ -1,12 +1,9 @@
 import { json, error } from '@sveltejs/kit';
-import { PAGE_SIZE, WALLABAG_MAX_PAGES } from '$env/static/private';
+import { PAGE_SIZE } from '$env/static/private';
 import { fetchArticlesApi } from '$lib/api';
 
 export async function GET({ setHeaders, url }) {
 	const page = url?.searchParams?.get('page') || '1';
-	// if (+page > +WALLABAG_MAX_PAGES) {
-	// 	error(404, 'Page does not exist');
-	// }
 	let limit = url?.searchParams?.get('limit') ?? PAGE_SIZE;
 	if (Number(limit) > 30) {
 		limit = PAGE_SIZE;
diff --git a/src/routes/articles/[page]/+page.server.ts b/src/routes/articles/[page]/+page.server.ts
index 430bd5c..f00a701 100644
--- a/src/routes/articles/[page]/+page.server.ts
+++ b/src/routes/articles/[page]/+page.server.ts
@@ -5,11 +5,6 @@ import type { ArticlePageLoad } from '$lib/types/article';
 
 export const load: PageServerLoad = async ({ fetch, params, setHeaders, url }) => {
 	const { page } = params;
-	// if (+page > +WALLABAG_MAX_PAGES) {
-	// 	error(404, {
-	// 		message: 'Not found',
-	// 	});
-	// }
 	const resp = await fetch(`/api/articles?page=${page}`);
 	const {
 		articles,
diff --git a/src/routes/sitemap.xml/+server.ts b/src/routes/sitemap.xml/+server.ts
index a91bd5f..92d5d18 100644
--- a/src/routes/sitemap.xml/+server.ts
+++ b/src/routes/sitemap.xml/+server.ts
@@ -1,10 +1,13 @@
 import type { RequestHandler } from '@sveltejs/kit';
 import { PUBLIC_URL } from '$env/static/public';
-import { WALLABAG_MAX_PAGES } from '$env/static/private';
+import type { ArticlePageLoad } from '$lib/types/article';
 
 const site = `https://${PUBLIC_URL}`;
 
 export const GET: RequestHandler = async function GET({ setHeaders }) {
+	const resp = await fetch(`/api/articles`);
+	const { totalPages }: ArticlePageLoad = await resp.json();
+
 	const xml = `<?xml version="1.0" encoding="UTF-8" ?>
     <urlset
       xmlns="https://www.sitemaps.org/schemas/sitemap/0.9"
@@ -32,7 +35,7 @@ export const GET: RequestHandler = async function GET({ setHeaders }) {
         <priority>1</priority>
       </url>
 
-      ${Array.from({ length: parseInt(WALLABAG_MAX_PAGES) }, (_, i) => {
+      ${Array.from({ length: totalPages }, (_, i) => {
         return `
           <url>
             <loc>${site}/articles/${i + 1}</loc>