feat: refactor whole bunch of stuff

routes/api/articles/[name].ts

@@ -1,6 +1,6 @@
 import { Handlers } from "$fresh/server.ts";
 import { json } from "@lib/helpers.ts";
-import { fetchResource } from "@lib/marka.ts";
+import { fetchResource } from "@lib/marka/index.ts";
 
 export const handler: Handlers = {
   async GET(_, ctx) {

routes/api/articles/create/index.ts

@@ -3,8 +3,6 @@ import { Defuddle } from "defuddle/node";
 import { AccessDeniedError, BadRequestError } from "@lib/errors.ts";
 import { createStreamResponse, isValidUrl } from "@lib/helpers.ts";
 import * as openai from "@lib/openai.ts";
-
-import { Article } from "@lib/resource/articles.ts";
 import { getYoutubeVideoDetails } from "@lib/youtube.ts";
 import {
   extractYoutubeId,
@@ -12,8 +10,9 @@ import {
   toUrlSafeString,
 } from "@lib/string.ts";
 import { createLogger } from "@lib/log/index.ts";
-import { createResource } from "@lib/marka.ts";
+import { createResource } from "@lib/marka/index.ts";
 import { webScrape } from "@lib/webScraper.ts";
+import { ArticleResource } from "@lib/marka/schema.ts";
 
 const log = createLogger("api/article");
 
@@ -93,7 +92,7 @@ async function processCreateYoutubeVideo(
 
   const id = newId || youtubeId;
 
-  const newArticle: Article = {
+  const newArticle: ArticleResource["content"] = {
     _type: "Article",
     headline: video.snippet.title,
     articleBody: video.snippet.description,

routes/api/articles/index.ts

@@ -1,6 +1,6 @@
 import { Handlers } from "$fresh/server.ts";
 import { json } from "@lib/helpers.ts";
-import { fetchResource } from "@lib/marka.ts";
+import { fetchResource } from "@lib/marka/index.ts";
 
 export const handler: Handlers = {
   async GET() {

routes/api/images/index.ts

@@ -63,8 +63,8 @@ function parseParams(reqUrl: URL): ImageParams | string {
 async function generateETag(content: ArrayBuffer): Promise<string> {
   const hashBuffer = await crypto.subtle.digest("SHA-256", content);
   return `"${Array.from(new Uint8Array(hashBuffer))
-    .map((b) => b.toString(16).padStart(2, "0"))
-    .join("")
+      .map((b) => b.toString(16).padStart(2, "0"))
+      .join("")
     }"`;
 }
 
@@ -80,13 +80,9 @@ async function GET(req: Request, _ctx: FreshContext): Promise<Response> {
       });
     }
 
-    const imageUrl = params.image.startsWith("resources")
-      ? `https://marka.max-richter.dev/${params.image.replace(/^\//, "")}`
-      : params.image;
+    log.debug("Processing image request:", { params });
 
-    log.debug("Processing image request:", { imageUrl, params });
-
-    const image = await getImageContent(imageUrl, params);
+    const image = await getImageContent(params.image, params);
 
     // Generate ETag based on image content
     const eTag = await generateETag(image.content);

routes/api/movies/[name].ts

@@ -1,11 +1,11 @@
 import { Handlers } from "$fresh/server.ts";
-import { Movie } from "@lib/resource/movies.ts";
 import { json } from "@lib/helpers.ts";
 import * as tmdb from "@lib/tmdb.ts";
 import { fileExtension } from "https://deno.land/x/file_extension@v2.1.0/mod.ts";
 import { isString, safeFileName } from "@lib/string.ts";
 import { AccessDeniedError } from "@lib/errors.ts";
-import { createResource, fetchResource } from "@lib/marka.ts";
+import { createResource, fetchResource } from "@lib/marka/index.ts";
+import { ReviewResource } from "@lib/marka/schema.ts";
 
 export const handler: Handlers = {
   async GET(_, ctx) {
@@ -50,7 +50,7 @@ export const handler: Handlers = {
       );
     }
 
-    const movie: Movie = {
+    const movie: ReviewResource["content"] = {
       _type: "Review",
       image: `resources/${finalPath}`,
       datePublished: releaseDate,

routes/api/movies/enhance/[name].ts

@@ -9,7 +9,7 @@ import {
   NotFoundError,
 } from "@lib/errors.ts";
 import { createRecommendationResource } from "@lib/recommendation.ts";
-import { createResource, fetchResource } from "@lib/marka.ts";
+import { createResource, fetchResource } from "@lib/marka/index.ts";
 
 const POST = async (
   req: Request,

routes/api/movies/index.ts

@@ -1,6 +1,6 @@
 import { Handlers } from "$fresh/server.ts";
 import { json } from "@lib/helpers.ts";
-import { fetchResource } from "@lib/marka.ts";
+import { fetchResource } from "@lib/marka/index.ts";
 
 export const handler: Handlers = {
   async GET() {

routes/api/recipes/[name].ts

@@ -1,6 +1,6 @@
 import { Handlers } from "$fresh/server.ts";
 import { json } from "@lib/helpers.ts";
-import { fetchResource } from "@lib/marka.ts";
+import { fetchResource } from "@lib/marka/index.ts";
 
 export const handler: Handlers = {
   async GET(_, ctx) {

routes/api/recipes/create/index.ts

@@ -3,15 +3,15 @@ import { AccessDeniedError, BadRequestError } from "@lib/errors.ts";
 import { createStreamResponse, isValidUrl } from "@lib/helpers.ts";
 import * as openai from "@lib/openai.ts";
 import { createLogger } from "@lib/log/index.ts";
-import { Recipe } from "@lib/resource/recipes.ts";
 import recipeSchema from "@lib/recipeSchema.ts";
 import { fileExtension } from "https://deno.land/x/file_extension@v2.1.0/mod.ts";
 import { safeFileName } from "@lib/string.ts";
 import { parseJsonLdToRecipeSchema } from "./parseJsonLd.ts";
 import z from "zod";
-import { createResource } from "@lib/marka.ts";
+import { createResource } from "@lib/marka/index.ts";
 import { webScrape } from "@lib/webScraper.ts";
 import { Defuddle } from "defuddle/node";
+import { RecipeResource } from "@lib/marka/schema.ts";
 
 const log = createLogger("api/article");
 
@@ -51,7 +51,7 @@ async function processCreateRecipeFromUrl(
     recipe = await openai.extractRecipe(result.content);
   }
 
-  const id = safeFileName(recipe?.title || "");
+  const id = safeFileName(recipe?.name || "");
 
   if (!recipe) {
     streamResponse.enqueue("failed to parse recipe");
@@ -59,23 +59,13 @@ async function processCreateRecipeFromUrl(
     return;
   }
 
-  const newRecipe: Recipe = {
+  const newRecipe: RecipeResource["content"] = {
+    ...recipe,
     _type: "Recipe",
-    name: recipe?.title,
-    description: recipe?.description,
-    recipeIngredient: recipe?.ingredients || [],
-    recipeInstructions: recipe?.instructions || [],
-    keywords: recipe.tags || [],
-    image: recipe?.image,
     totalTime: recipe?.totalTime
       ? `${recipe?.totalTime?.toString()} minutes`
       : undefined,
     url: fetchUrl,
-    author: {
-      _type: "Person",
-      name: recipe?.author,
-    },
-    recipeYield: recipe?.servings,
   };
 
   if (newRecipe?.image && newRecipe.image.length > 5) {

routes/api/recipes/index.ts

@@ -1,6 +1,6 @@
 import { Handlers } from "$fresh/server.ts";
 import { json } from "@lib/helpers.ts";
-import { fetchResource } from "@lib/marka.ts";
+import { fetchResource } from "@lib/marka/index.ts";
 
 export const handler: Handlers = {
   async GET() {

routes/api/recommendation/all.ts

@@ -1,25 +1,25 @@
 import { Handlers } from "$fresh/server.ts";
 import { createStreamResponse } from "@lib/helpers.ts";
-import { Movie } from "@lib/resource/movies.ts";
 import * as tmdb from "@lib/tmdb.ts";
 import {
   createRecommendationResource,
   getRecommendation,
 } from "@lib/recommendation.ts";
 import { AccessDeniedError } from "@lib/errors.ts";
-import { fetchResource } from "@lib/marka.ts";
+import { listResources } from "@lib/marka/index.ts";
+import { ReviewResource } from "@lib/marka/schema.ts";
 
 async function processUpdateRecommendations(
   streamResponse: ReturnType<typeof createStreamResponse>,
 ) {
-  const allMovies = await fetchResource("movies");
+  const allMovies = await listResources<ReviewResource>("movies");
 
-  const movies = allMovies?.content.filter((m) => {
+  const movies = allMovies?.filter((m: ReviewResource) => {
     if (!m?.content) return false;
     if (!m.content.reviewRating) return false;
     if (!m.content.tmdbId) return false;
     return true;
-  }) as Movie[];
+  }) as ReviewResource[];
 
   streamResponse.enqueue("Fetched all movies");
 
@@ -27,22 +27,23 @@ async function processUpdateRecommendations(
   const total = movies.length;
 
   await Promise.all(movies.map(async (movie) => {
-    if (!movie.meta.tmdbId) return;
-    if (!movie.meta.rating) return;
-    const recommendation = getRecommendation(movie.id, movie.type);
+    if (!movie.content.tmdbId) return;
+    if (!movie.content.reviewRating) return;
+    const recommendation = getRecommendation(movie.name, movie.type);
     if (recommendation) {
       done++;
       return;
     }
     try {
-      const movieDetails = await tmdb.getMovie(movie.meta.tmdbId);
+      const movieDetails = await tmdb.getMovie(movie.content.tmdbId);
       await createRecommendationResource(movie, movieDetails.overview);
     } catch (err) {
       console.log(err);
     }
     done++;
     streamResponse.enqueue(
-      `${Math.floor((done / total) * 100)}% [${done + 1}/${total}] ${movie.id}`,
+      `${Math.floor((done / total) * 100)}% [${done + 1
+      }/${total}] ${movie.name}`,
     );
   })).catch((err) => {
     console.log(err);

routes/api/series/[name].ts

@@ -4,8 +4,8 @@ import * as tmdb from "@lib/tmdb.ts";
 import { fileExtension } from "https://deno.land/x/file_extension@v2.1.0/mod.ts";
 import { isString, safeFileName } from "@lib/string.ts";
 import { AccessDeniedError } from "@lib/errors.ts";
-import { Series } from "@lib/resource/series.ts";
-import { createResource, fetchResource } from "@lib/marka.ts";
+import { createResource, fetchResource } from "@lib/marka/index.ts";
+import { ReviewResource } from "@lib/marka/schema.ts";
 
 export const handler: Handlers = {
   async GET(_, ctx) {
@@ -49,7 +49,7 @@ export const handler: Handlers = {
       );
     }
 
-    const series: Series = {
+    const series: ReviewResource["content"] = {
       _type: "Review",
       image: `resources/${finalPath}`,
       datePublished: releaseDate,

routes/api/series/enhance/[name].ts

@@ -9,7 +9,7 @@ import {
   BadRequestError,
   NotFoundError,
 } from "@lib/errors.ts";
-import { createResource, fetchResource } from "@lib/marka.ts";
+import { createResource, fetchResource } from "@lib/marka/index.ts";
 
 const isString = (input: string | undefined): input is string => {
   return typeof input === "string";

routes/api/series/index.ts

@@ -1,6 +1,6 @@
 import { Handlers } from "$fresh/server.ts";
 import { json } from "@lib/helpers.ts";
-import { fetchResource } from "@lib/marka.ts";
+import { fetchResource } from "@lib/marka/index.ts";
 
 export const handler: Handlers = {
   async GET() {