From 63838050cd49857f81b218191e684e705f83f49c Mon Sep 17 00:00:00 2001
From: Matt Leon <108271225+wydengyre@users.noreply.github.com>
Date: Mon, 29 Jan 2024 15:36:38 +0700
Subject: [PATCH] move-genre-handling-to-rai (#49)

move genre handling to rai
---
 {server => rai}/genres.test.ts | 4 ++--
 {server => rai}/genres.ts      | 4 ++--
 server/handler.ts              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename {server => rai}/genres.test.ts (90%)
 rename {server => rai}/genres.ts (96%)

diff --git a/server/genres.test.ts b/rai/genres.test.ts
similarity index 90%
rename from server/genres.test.ts
rename to rai/genres.test.ts
index f8973aa..a069dae 100644
--- a/server/genres.test.ts
+++ b/rai/genres.test.ts
@@ -1,9 +1,9 @@
 import { strict as assert } from "node:assert";
 import test from "node:test";
 import { json } from "itty-router";
-import { FetchWithErr, NotOk, OkResponse } from "../rai/fetch.js";
-import genresJson from "../rai/test/generi.json" with { type: "json" };
+import { FetchWithErr, NotOk, OkResponse } from "./fetch.js";
 import { genresHtml } from "./genres.js";
+import genresJson from "./test/generi.json" with { type: "json" };
 
 test("genres", async (t) => {
 	await t.test(genresHtmlSuccess);
diff --git a/server/genres.ts b/rai/genres.ts
similarity index 96%
rename from server/genres.ts
rename to rai/genres.ts
index 12dddaa..fc88ebc 100644
--- a/server/genres.ts
+++ b/rai/genres.ts
@@ -26,11 +26,11 @@ async function genresHtml(c: Conf): Promise<string> {
 	return renderGenres(c.baseUrl, json);
 }
 
-const fetchGenres = async (c: Conf) => {
+async function fetchGenres(c: Conf) {
 	const url = new URL("generi.json", c.raiBaseUrl);
 	const res = await c.fetchWithErr(url.toString());
 	return res.json();
-};
+}
 
 async function renderGenres(baseUrl: URL, json: unknown): Promise<string> {
 	const parseResult = await schema.safeParseAsync(json);
diff --git a/server/handler.ts b/server/handler.ts
index 9e5b478..c5212cb 100644
--- a/server/handler.ts
+++ b/server/handler.ts
@@ -1,7 +1,7 @@
 import { Router, createResponse, error, html, text } from "itty-router";
 import { mkFetchWithErr } from "../rai/fetch.js";
+import { genresHtml } from "../rai/genres.js";
 import { feedHandler } from "./feed-handler.js";
-import { genresHtml } from "./genres.js";
 import { Logger } from "./logger.js";
 
 export { Config, FetchHandler, mkFetchHandler };