add tag_format option

src/helpers/char.ts

@@ -1,3 +1,5 @@
+/* eslint-disable prettier/prettier */
+
 import { booruConfig } from "@config/booru";
 
 export function timestampToReadable(timestamp?: number): string {
@@ -74,6 +76,7 @@ export function determineBooru(
 export function postExpectedFormat(
 	booru: IBooruConfig,
 	posts: BooruPost[] | BooruPost,
+	tag_format: string = "string",
 ): { posts: BooruPost[] } | null {
 	if (!posts) return null;
 
@@ -89,9 +92,12 @@ export function postExpectedFormat(
 					post_url:
 						post.post_url ??
 						`https://${booru.endpoint}/posts/${post.id}`,
-					tags: Object.values(post.tags || {})
+					tags:
-						.flat()
+						tag_format === "unformatted"
-						.join(" "),
+							? post.tags
+							: Object.values(post.tags || {})
+								.flat()
+								.join(" "),
 				};
 			}),
 		};

src/routes/[booru]/id/[id].ts

@@ -17,7 +17,10 @@ async function handler(
 	query: Query,
 	params: Params,
 ): Promise<Response> {
-	const { force } = query as { force: string };
+	const { force, tag_format } = query as {
+		force: string;
+		tag_format: string;
+	};
 	const { booru, id } = params as { booru: string; id: string };
 
 	if (!booru || !id) {
@@ -70,7 +73,7 @@ async function handler(
 		url = `https://${booruConfig.endpoint}/${start}${id}${end}`;
 	}
 
-	const cacheKey: string = `nsfw:${booru}:${id}`;
+	const cacheKey: string = `nsfw:${booru}:tag_format(${tag_format}):${id}`;
 	if (!force) {
 		const cacheData: unknown = await redis
 			.getInstance()
@@ -166,6 +169,7 @@ async function handler(
 		const expectedData: { posts: BooruPost[] } | null = postExpectedFormat(
 			booruConfig,
 			posts,
+			tag_format,
 		);
 
 		if (!expectedData) {

src/routes/[booru]/random.ts

@@ -30,10 +30,12 @@ async function handler(
 		tags,
 		results = 5,
 		excludeTags,
+		tag_format = "formatted",
 	} = requestBody as {
 		tags: string[];
 		results: number;
 		excludeTags: string[];
+		tag_format: string;
 	};
 
 	if (!booru) {
@@ -200,7 +202,7 @@ async function handler(
 	let state: { tries: number; page: number } = { tries: 0, page: 16 };
 
 	while (state.tries < config.maxTries) {
-		const cacheKey: string = `nsfw:${booru}:random:${tagsString()}:${results}:${state.page}`;
+		const cacheKey: string = `nsfw:${booru}:random:tag_format(${tag_format}):${tagsString()}:${results}:${state.page}`;
 		if (!force) {
 			const cacheData: unknown = await redis
 				.getInstance()
@@ -286,7 +288,7 @@ async function handler(
 			if (posts.length === 0) continue;
 
 			let expectedData: { posts: BooruPost[] } | null =
-				postExpectedFormat(booruConfig, posts);
+				postExpectedFormat(booruConfig, posts, tag_format);
 
 			if (!expectedData) continue;
 

src/routes/[booru]/search.ts

@@ -28,11 +28,13 @@ async function handler(
 		tags,
 		results = 5,
 		excludeTags,
+		tag_format = "formatted",
 	} = requestBody as {
 		page: 0;
 		tags: string[] | string;
 		results: number;
 		excludeTags: string[] | string;
+		tag_format: string;
 	};
 
 	if (!booru) {
@@ -170,7 +172,7 @@ async function handler(
 		return parts.join("");
 	};
 
-	const cacheKey: string = `nsfw:${booru}:${formattedTags}:${formattedExcludeTags}:${safePage}:${safeResults}`;
+	const cacheKey: string = `nsfw:${booru}:tag_format(${tag_format}):${formattedTags}:${formattedExcludeTags}:${safePage}:${safeResults}`;
 	if (!force) {
 		const cacheData: unknown = await redis
 			.getInstance()
@@ -256,6 +258,7 @@ async function handler(
 		const expectedData: { posts: BooruPost[] } | null = postExpectedFormat(
 			booruConfig,
 			posts,
+			tag_format,
 		);
 
 		if (!expectedData) {