From 11b4eb98e2a80ab74ff73795c1f68146cb531a03 Mon Sep 17 00:00:00 2001
From: creations <creations@creations.works>
Date: Thu, 6 Feb 2025 11:42:04 -0500
Subject: [PATCH] fix random not defaulting to page 0

---
 src/routes/[booru]/random.ts | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/routes/[booru]/random.ts b/src/routes/[booru]/random.ts
index a2f482a..2ac0597 100644
--- a/src/routes/[booru]/random.ts
+++ b/src/routes/[booru]/random.ts
@@ -200,16 +200,6 @@ async function handler(
 	let state: { tries: number; page: number } = { tries: 0, page: 16 };
 
 	while (state.tries < config.maxTries) {
-		if (state.tries === config.maxTries) {
-			state.page = 0;
-		} else {
-			const oldPage: number = state.page;
-
-			do {
-				state.page = Math.floor(Math.random() * config.maxPage);
-			} while (state.page === oldPage);
-		}
-
 		const cacheKey: string = `nsfw:${booru}:random:${tagsString()}:${results}:${state.page}`;
 		if (!force) {
 			const cacheData: unknown = await redis
@@ -322,10 +312,19 @@ async function handler(
 			continue;
 		} finally {
 			state.tries++;
+
+			if (state.tries >= config.maxTries - 1) {
+				state.page = 0;
+			} else {
+				const oldPage: number = state.page;
+				do {
+					state.page = Math.floor(Math.random() * config.maxPage);
+				} while (state.page === oldPage);
+			}
 		}
 	}
 
-	await redis.getInstance().set("JSON", noResultsCacheKey, true, 60 * 30); // 30 minutes
+	await redis.getInstance().set("JSON", noResultsCacheKey, true, 60 * 10); // 10 minutes
 
 	logger.error([
 		"No posts found",