fix: lazily import sharp to fix commonjs error

.gitignore

@@ -1,4 +1,3 @@
-# dotenv environment variable files
 .env
 .env.development.local
 .env.test.local
@@ -10,3 +9,4 @@ data-dev/
 _fresh/
 node_modules/
 mise.toml
+

Dockerfile

@@ -1,10 +1,10 @@
-FROM denoland/deno:2.5.4 AS build
+FROM denoland/deno:2.6.4 AS build
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    curl ffmpeg && \
-    deno run -A npm:playwright install --with-deps firefox &&\
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+  curl ffmpeg && \
+  deno run -A npm:playwright install --with-deps firefox &&\
+  apt-get clean && \
+  rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
@@ -15,11 +15,11 @@ COPY . .
 ENV DATA_DIR=/app/data
 
 RUN mkdir -p $DATA_DIR && \
-    deno install --allow-import --allow-ffi --allow-scripts=npm:sharp -e main.ts &&\
-    sed -i -e 's/"deno"/"no-deno"/' node_modules/@libsql/client/package.json &&\
-    deno task build
+  deno install --allow-import --allow-ffi -e main.ts &&\
+  sed -i -e 's/"deno"/"no-deno"/' node_modules/@libsql/client/package.json &&\
+  deno install npm:@libsql/linux-x64-gnu &&\
+  deno task build
 
 EXPOSE 8000
 
-CMD ["run", "-A", "main.ts"]
-
+CMD ["task", "start"]

README.md

@@ -5,18 +5,13 @@ Started" guide here: https://fresh.deno.dev/docs/getting-started
 
 ### Usage
 
-Make sure to install Deno: https://deno.land/manual/getting_started/installation
+Make sure to install Deno:
+https://docs.deno.com/runtime/getting_started/installation
 
-Then start the project:
+Then start the project in development mode:
 
 ```
-deno task start
+deno task dev
 ```
 
 This will watch the project directory and restart as necessary.
-
-## FIX
-
-```
-sed -i -e 's/"deno"/"no-deno"/' node_modules/@libsql/client/package.json
-```

assets/styles.css

@@ -0,0 +1 @@
+@import "tailwindcss";

client.ts

@@ -0,0 +1,2 @@
+// Import CSS files here for hot module reloading to work.
+import "./assets/styles.css";

components/Button.tsx

@@ -1,12 +1,10 @@
-import { JSX } from "preact";
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { ButtonHTMLAttributes } from "preact";
 
-export function Button(props: JSX.HTMLAttributes<HTMLButtonElement>) {
+export function Button(props: ButtonHTMLAttributes<HTMLButtonElement>) {
   return (
     <button
       {...props}
-      disabled={!IS_BROWSER || props.disabled}
-      class={`px-2 py-1  ${props.class ? props.class : " "}`}
+      class={`cursor-pointer px-2 py-1 ${props.class ? props.class : ""}`}
     />
   );
 }

components/Card.tsx

@@ -1,7 +1,6 @@
 import { isYoutubeLink } from "@lib/string.ts";
 import { IconBrandYoutube } from "@components/icons.tsx";
 import { SmallRating } from "@components/Rating.tsx";
-import { Link } from "@islands/Link.tsx";
 import { parseRating } from "@lib/helpers.ts";
 import { GenericResource, getNameOfResource } from "@lib/marka/schema.ts";
 
@@ -24,7 +23,7 @@ export function Card(
     rating?: number;
   },
 ) {
-  const backgroundStyle: preact.JSX.CSSProperties = {
+  const backgroundStyle: preact.CSSProperties = {
     backgroundSize: "cover",
     backgroundColor: backgroundColor,
   };
@@ -36,7 +35,7 @@ export function Card(
   }
 
   return (
-    <Link
+    <a
       href={link}
       style={backgroundStyle}
       data-thumb={thumbhash}
@@ -88,7 +87,7 @@ export function Card(
         )}
       </div>
       <div class="absolute inset-x-0 bottom-0 h-3/4" />
-    </Link>
+    </a>
   );
 }
 

components/Checkbox.tsx

@@ -1,67 +1,5 @@
 import { Signal, useSignal } from "@preact/signals";
-import { useId, useState } from "preact/hooks";
-
-interface CheckboxProps {
-  label: string;
-  isChecked?: boolean;
-  onChange: (isChecked: boolean) => void;
-}
-
-const Checkbox2: preact.FunctionalComponent<CheckboxProps> = (
-  { label, isChecked = false, onChange },
-) => {
-  const [checked, setChecked] = useState(isChecked);
-
-  const toggleCheckbox = () => {
-    const newChecked = !checked;
-    setChecked(newChecked);
-    onChange(newChecked);
-  };
-
-  return (
-    <div
-      class="flex items-center rounded-xl p-1 pl-4"
-      style={{ background: "var(--background)", color: "var(--foreground)" }}
-    >
-      <span>
-        {label}
-      </span>
-      <label
-        class="relative flex cursor-pointer items-center rounded-full p-3"
-        for="checkbox"
-        data-ripple-dark="true"
-      >
-        <input
-          type="checkbox"
-          class="before:content[''] peer relative h-5 w-5 cursor-pointer appearance-none rounded-md border border-blue-gray-200 transition-all before:absolute before:top-2/4 before:left-2/4 before:block before:h-12 before:w-12 before:-translate-y-2/4 before:-translate-x-2/4 before:rounded-full before:bg-blue-gray-500 before:opacity-0 before:transition-opacity  hover:before:opacity-10"
-          id="checkbox"
-          checked
-        />
-        <div
-          class={`pointer-events-none absolute top-2/4 left-2/4 -translate-y-2/4 -translate-x-2/4 text-white opacity-${
-            checked ? 100 : 0
-          } transition-opacity`}
-        >
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            class="h-3.5 w-3.5"
-            viewBox="0 0 20 20"
-            fill="white"
-            stroke="currentColor"
-            stroke-width="1"
-          >
-            <path
-              fill-rule="evenodd"
-              d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
-              clip-rule="evenodd"
-            >
-            </path>
-          </svg>
-        </div>
-      </label>
-    </div>
-  );
-};
+import { useId } from "preact/hooks";
 
 const Checkbox = (
   { label, checked = useSignal(false) }: {

components/Emoji.tsx

@@ -1,4 +1,4 @@
-import { asset } from "$fresh/runtime.ts";
+import { asset } from "fresh/runtime";
 
 export const Emoji = (props: { class?: string; name: string }) => {
   return props.name
@@ -10,5 +10,5 @@ export const Emoji = (props: { class?: string; name: string }) => {
         />
       )
       : <span>{props.name}</span>
-    : <></>;
+    : null;
 };

components/Image.tsx

@@ -1,5 +1,4 @@
-import { asset } from "$fresh/runtime.ts";
-import * as CSS from "csstype";
+import { asset } from "fresh/runtime";
 
 interface ResponsiveAttributes {
   srcset: string;
@@ -38,7 +37,7 @@ const Image = (
     fill?: boolean;
     width?: number | string;
     height?: number | string;
-    style?: CSS.HtmlAttributes;
+    style?: preact.CSSProperties;
   },
 ) => {
   const responsiveAttributes = generateResponsiveAttributes(
@@ -47,6 +46,11 @@ const Image = (
     "/api/images",
   );
 
+  const hasDimensions = typeof props.width === "number" &&
+    typeof props.height === "number";
+  const sizes = hasDimensions ? "" : responsiveAttributes.sizes;
+  const srcset = hasDimensions ? "" : responsiveAttributes.srcset;
+
   return (
     <span
       style={{
@@ -62,8 +66,8 @@ const Image = (
         loading="lazy"
         alt={props.alt}
         style={props.style}
-        srcset={responsiveAttributes.srcset}
-        sizes={responsiveAttributes.sizes}
+        sizes={sizes}
+        srcset={srcset}
         src={`/api/images?image=${asset(props.src)}${
           props.width ? `&width=${props.width}` : ""
         }${props.height ? `&height=${props.height}` : ""}`}

components/MetaTags.tsx

@@ -1,4 +1,4 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { GenericResource, getNameOfResource } from "@lib/marka/schema.ts";
 import { formatDate } from "@lib/string.ts";
 
@@ -26,7 +26,7 @@ function generateJsonLd(resource: GenericResource): string {
   if (resource.content?.datePublished) {
     try {
       baseSchema.datePublished = formatDate(
-        new Date(resource.content.datePublished),
+        resource.content.datePublished,
       );
     } catch (_) {
       // Ignore invalid date
@@ -60,6 +60,7 @@ export function MetaTags({ resource }: { resource: GenericResource }) {
         />
         <script
           type="application/ld+json"
+          // deno-lint-ignore react-no-danger
           dangerouslySetInnerHTML={{ __html: jsonLd }}
         />
       </Head>

components/PageHero.tsx

@@ -21,7 +21,7 @@ function Wrapper(
   return (
     <div
       class={`flex justify-between flex-col relative w-full ${
-        image ? "min-h-[400px]" : "min-h-[200px]"
+        image ? "min-h-100" : "min-h-50"
       } rounded-3xl overflow-hidden`}
     >
       <HeroContext.Provider value={{ image }}>
@@ -62,7 +62,7 @@ function Title(
       >
         {children}
         {link &&
-          <IconExternalLink />}
+          <IconExternalLink class="h-6 w-6" />}
       </h2>
     </OuterTag>
   );
@@ -110,7 +110,7 @@ function Subline(
   const ctx = useContext(HeroContext);
   return (
     <div
-      class={`relative flex items-center z-10 flex gap-5 font-sm text-light mt-3`}
+      class={`relative items-center z-10 flex gap-5 font-sm text-light mt-3`}
       style={{ color: ctx.image ? "#1F1F1F" : "white" }}
     >
       {children}

components/Rating.tsx

@@ -1,5 +1,5 @@
 import { IconStar, IconStarFilled } from "@components/icons.tsx";
-import { useSignal } from "@preact/signals";
+import { Signal, useSignal } from "@preact/signals";
 import { useState } from "preact/hooks";
 
 export const SmallRating = (
@@ -24,27 +24,30 @@ export const SmallRating = (
 };
 
 export const Rating = (
-  props: { max?: number; rating: number },
+  { max, rating = useSignal(0) }: {
+    max?: number;
+    rating: Signal<number | undefined>;
+  },
 ) => {
-  const [rating, setRating] = useState(props.rating);
   const [hover, setHover] = useState(0);
-  const max = useSignal(props.max || 5);
+
+  const ratingValue = rating.value || 0;
 
   return (
     <div
-      class="flex items-center gap-2 px-5 rounded-2xl bg-gray-200 z-10"
+      class="flex items-center gap-2 px-5 rounded-2xl bg-gray-200 z-10 h-full"
       style={{ color: "var(--foreground)", background: "var(--background)" }}
     >
-      {Array.from({ length: max.value }).map((_, i) => {
+      {Array.from({ length: max || 5 }).map((_, i) => {
         return (
           <span
             class={`cursor-pointer opacity-${
-              (i + 1) <= rating ? 100 : (i + 1) <= hover ? 20 : 100
+              (i + 1) <= ratingValue ? 100 : (i + 1) <= hover ? 20 : 100
             }`}
             onMouseOver={() => setHover(i + 1)}
-            onClick={() => setRating(i + 1)}
+            onClick={() => (rating.value = i + 1)}
           >
-            {(i + 1) <= rating || (i + 1) <= hover
+            {(i + 1) <= ratingValue || (i + 1) <= hover
               ? <IconStarFilled class="w-4 h-4" />
               : <IconStar class="w-4 h-4" />}
           </span>

components/Stars.tsx

@@ -10,9 +10,9 @@ export const Star = (
     >
       {Array.from({ length: max }).map((_, i) => {
         if ((i + 1) <= rating) {
-          return <IconStarFilled class="w-4 h-4" />;
+          return <IconStarFilled key={i} class="w-4 h-4" />;
         }
-        return <IconStar class="w-4 h-4" />;
+        return <IconStar key={i} class="w-4 h-4" />;
       })}
     </div>
   );

components/icons.tsx

@@ -1,19 +1,23 @@
-export { default as IconStar } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/star.tsx";
-export { default as IconStarFilled } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/star-filled.tsx";
-export { default as IconExternalLink } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/external-link.tsx";
-export { default as IconArrowNarrowLeft } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/arrow-narrow-left.tsx";
-export { default as IconEdit } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/edit.tsx";
-export { default as IconArrowLeft } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/arrow-left.tsx";
-export { default as IconError404 } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/error-404.tsx";
-export { default as IconSquareRoundedPlus } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/square-rounded-plus.tsx";
-export { default as IconReportSearch } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/report-search.tsx";
-export { default as IconRefresh } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/refresh.tsx";
-export { default as IconCirclePlus } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/circle-plus.tsx";
-export { default as IconCircleMinus } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/circle-minus.tsx";
-export { default as IconLoader2 } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/loader-2.tsx";
-export { default as IconLogin } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/login.tsx";
-export { default as IconLogout } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/logout.tsx";
-export { default as IconSearch } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/search.tsx";
-export { default as IconGhost } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/ghost.tsx";
-export { default as IconBrandYoutube } from "https://deno.land/x/tabler_icons_tsx@0.0.3/tsx/brand-youtube.tsx";
-export { default as IconWand } from "https://deno.land/x/tabler_icons_tsx@0.0.5/tsx/wand.tsx";
+export {
+  TbAlertCircle as IconAlertCircle,
+  TbArrowLeft as IconArrowLeft,
+  TbArrowNarrowLeft as IconArrowNarrowLeft,
+  TbBrandYoutube as IconBrandYoutube,
+  TbCircleMinus as IconCircleMinus,
+  TbCirclePlus as IconCirclePlus,
+  TbEdit as IconEdit,
+  TbError404 as IconError404,
+  TbExternalLink as IconExternalLink,
+  TbGhost as IconGhost,
+  TbLoader2 as IconLoader2,
+  TbLogin as IconLogin,
+  TbLogout as IconLogout,
+  TbMenu2 as IconMenu2,
+  TbRefresh as IconRefresh,
+  TbReportSearch as IconReportSearch,
+  TbSearch as IconSearch,
+  TbSquareRoundedPlus as IconSquareRoundedPlus,
+  TbStar as IconStar,
+  TbStarFilled as IconStarFilled,
+  TbWand as IconWand,
+} from "@preact-icons/tb";

components/layouts/main.tsx

@@ -12,17 +12,25 @@ export type Props = {
   searchResults?: GenericResource[];
 };
 
+function getQFromUrl(u: string | URL): string | null {
+  try {
+    const _u = typeof u === "string" ? new URL(u) : u;
+    return _u?.searchParams.get("q");
+  } catch (_e) {
+    return null;
+  }
+}
+
 export const MainLayout = (
   { children, url, context, searchResults }: Props,
 ) => {
-  const _url = typeof url === "string" ? new URL(url) : url;
-  const hasSearch = _url?.search?.includes("q=");
+  const q = getQFromUrl(url);
 
-  if (hasSearch) {
+  if (typeof q === "string") {
     return (
       <Search
-        q={_url.searchParams.get("q") || ""}
         {...context}
+        q={q}
         results={searchResults}
       />
     );

compose.yml

@@ -4,10 +4,10 @@ services:
       context: .
       dockerfile: Dockerfile
     volumes:
-      - .:/app # Mount the local directory to /app in the container
-    working_dir: /app # Set the working directory inside the container to /app
-    command: run --env-file -A --watch=static/,routes/ dev.ts # Custom start command
+      - .:/app
+    working_dir: /app
+    command: deno task dev --host 0.0.0.0
     ports:
-      - "8000:8000" # Expose the container port
+      - "8000:8000"
     environment:
-      - DATA_DIR=/app/data # Set the environment variable inside the container
+      - DATA_DIR=/app/data

deno.json

@@ -1,57 +1,99 @@
 {
-  "lock": false,
-  "nodeModulesDir": "auto",
-  "unstable": ["cron"],
+  "nodeModulesDir": "manual",
   "tasks": {
-    "check": "deno fmt --check && deno lint && deno check **/*.ts && deno check **/*.tsx",
-    "dev": "deno run --env-file -A --watch=static/,routes/ dev.ts",
-    "start": "deno run --env-file -A main.ts",
+    "check": "deno fmt --check . && deno lint . && deno check",
+    "dev": "vite",
     "db": "deno run --env-file -A npm:drizzle-kit",
-    "build": "deno run -A dev.ts build",
-    "preview": "deno run -A main.ts",
-    "update": "deno run -A -r https://fresh.deno.dev/update ."
+    "build": "vite build",
+    "start": "deno serve -A _fresh/server.js",
+    "update": "deno run -A -r jsr:@fresh/update ."
   },
-  "lint": { "rules": { "tags": ["fresh", "recommended"] } },
+  "lint": {
+    "rules": {
+      "tags": [
+        "fresh",
+        "recommended"
+      ]
+    }
+  },
+  "exclude": [
+    "**/_fresh/*"
+  ],
   "imports": {
-    "$fresh/": "https://deno.land/x/fresh@1.7.3/",
+    "@cmd-johnson/oauth2-client": "jsr:@cmd-johnson/oauth2-client@^2.0.0",
     "@components": "./components",
     "@components/": "./components/",
-    "@denosaurs/emoji": "jsr:@denosaurs/emoji@^0.3.1",
+    "@deno/gfm": "jsr:@deno/gfm@^0.11.0",
     "@islands": "./islands",
     "@islands/": "./islands/",
     "@lib": "./lib",
     "@lib/": "./lib/",
-    "@libsql/client": "npm:@libsql/client@^0.14.0",
-    "@openai/openai": "jsr:@openai/openai@^6.7.0",
-    "@preact/signals": "https://esm.sh/*@preact/signals@1.2.2",
-    "@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.5.1",
-    "@std/http": "jsr:@std/http@^1.0.12",
-    "@std/yaml": "jsr:@std/yaml@^1.0.5",
-    "csstype": "npm:csstype@^3.1.3",
+    "@/": "./",
+    "@libsql/client": "npm:@libsql/client@^0.17.0",
+    "@libsql/linux-x64-gnu": "npm:@libsql/linux-x64-gnu@^0.5.22",
+    "@openai/openai": "jsr:@openai/openai@^6.16.0",
+    "@preact-icons/tb": "jsr:@preact-icons/tb@^1.0.14",
+    "@std/http": "jsr:@std/http@^1.0.23",
+    "@std/media-types": "jsr:@std/media-types@^1.1.0",
+    "@zaubrik/djwt": "jsr:@zaubrik/djwt@^3.0.2",
     "defuddle": "npm:defuddle@^0.6.6",
-    "drizzle-kit": "npm:drizzle-kit@^0.30.1",
-    "drizzle-orm": "npm:drizzle-orm@^0.38.3",
+    "drizzle-kit": "npm:drizzle-kit@^0.31.8",
+    "drizzle-orm": "npm:drizzle-orm@^0.45.1",
+    "fresh": "jsr:@fresh/core@^2.2.0",
     "fuzzysort": "npm:fuzzysort@^3.1.0",
-    "jsdom": "npm:jsdom@^24.1.3",
+    "gfm": "jsr:@deno/gfm@0.11.0",
+    "jsdom": "npm:jsdom@^27.4.0",
     "moviedb-promise": "npm:moviedb-promise@^4.0.7",
     "parse-ingredient": "npm:parse-ingredient@^1.3.1",
-    "playwright": "npm:playwright@^1.49.1",
     "playwright-extra": "npm:playwright-extra@^4.3.6",
-    "preact": "https://esm.sh/preact@10.22.0",
-    "preact-render-to-string": "https://esm.sh/*preact-render-to-string@6.2.2",
-    "preact/": "https://esm.sh/preact@10.22.0/",
-    "gfm": "jsr:@deno/gfm",
+    "preact": "npm:preact@^10.27.2",
+    "@preact/signals": "npm:@preact/signals@^2.5.0",
+    "@fresh/plugin-vite": "jsr:@fresh/plugin-vite@^1.0.8",
     "puppeteer-extra-plugin-stealth": "npm:puppeteer-extra-plugin-stealth@^2.11.2",
-    "tailwindcss": "npm:tailwindcss@^3.4.17",
-    "tailwindcss/": "npm:/tailwindcss@^3.4.17/",
-    "tailwindcss/plugin": "npm:/tailwindcss@^3.4.17/plugin.js",
-    "camelcase-css": "npm:camelcase-css",
+    "sharp": "npm:sharp@^0.34.5",
     "thumbhash": "npm:thumbhash@^0.1.1",
-    "tsx": "npm:tsx@^4.19.2",
-    "yaml": "https://deno.land/std@0.197.0/yaml/mod.ts",
-    "zod": "npm:zod@^3.24.1",
-    "fs": "https://deno.land/std/fs/mod.ts"
+    "turndown": "npm:turndown@^7.2.2",
+    "vite": "npm:vite@^7.1.3",
+    "tailwindcss": "npm:tailwindcss@^4.1.10",
+    "@tailwindcss/vite": "npm:@tailwindcss/vite@^4.1.12",
+    "zod": "npm:zod@^4.3.5"
   },
-  "compilerOptions": { "jsx": "react-jsx", "jsxImportSource": "preact" },
-  "exclude": ["**/_fresh/*"]
+  "compilerOptions": {
+    "lib": [
+      "dom",
+      "dom.asynciterable",
+      "dom.iterable",
+      "deno.ns"
+    ],
+    "jsx": "precompile",
+    "jsxImportSource": "preact",
+    "jsxPrecompileSkipElements": [
+      "a",
+      "img",
+      "source",
+      "body",
+      "html",
+      "head",
+      "title",
+      "meta",
+      "script",
+      "link",
+      "style",
+      "base",
+      "noscript",
+      "template"
+    ],
+    "types": [
+      "vite/client"
+    ]
+  },
+  "allowScripts": {
+    "allow": [
+      "npm:sharp@0.34.5",
+      "npm:esbuild@0.27.2",
+      "npm:esbuild@0.18.20",
+      "npm:esbuild@0.25.12",
+      "npm:esbuild@0.25.7"
+    ]
+  }
 }

dev.ts

@@ -1,8 +0,0 @@
-#!/usr/bin/env -S deno run -A --watch=static/,routes/
-
-import dev from "$fresh/dev.ts";
-import config from "./fresh.config.ts";
-
-await dev(import.meta.url, "./main.ts", config);
-
-Deno.exit(0);

drizzle/0000_dashing_sunspot.sql

@@ -1,20 +1,22 @@
 CREATE TABLE `performance` (
-	`path` text NOT NULL,
-	`search` text,
-	`time` integer NOT NULL,
-	`created_at` integer DEFAULT (current_timestamp)
+  `path` text NOT NULL,
+  `search` text,
+  `time` integer NOT NULL,
+  `created_at` integer DEFAULT (CURRENT_TIMESTAMP)
 );
+
 --> statement-breakpoint
 CREATE TABLE `session` (
-	`id` text PRIMARY KEY NOT NULL,
-	`created_at` integer DEFAULT (current_timestamp),
-	`expires_at` integer NOT NULL,
-	`user_id` text NOT NULL
+  `id` text PRIMARY KEY NOT NULL,
+  `created_at` integer DEFAULT (CURRENT_TIMESTAMP),
+  `expires_at` integer NOT NULL,
+  `user_id` text NOT NULL
 );
+
 --> statement-breakpoint
 CREATE TABLE `user` (
-	`id` text PRIMARY KEY NOT NULL,
-	`created_at` integer DEFAULT (current_timestamp) NOT NULL,
-	`email` text NOT NULL,
-	`name` text NOT NULL
+  `id` text PRIMARY KEY NOT NULL,
+  `created_at` integer DEFAULT (CURRENT_TIMESTAMP) NOT NULL,
+  `email` text NOT NULL,
+  `name` text NOT NULL
 );

drizzle/0001_classy_justin_hammer.sql

@@ -1 +1,4 @@
-ALTER TABLE `performance` ALTER COLUMN "created_at" TO "created_at" integer DEFAULT (STRFTIME('%s', 'now') * 1000);
+ALTER TABLE
+  `performance`
+ALTER COLUMN
+  "created_at" TO "created_at" integer DEFAULT (STRFTIME('%s', 'now') * 1000);

drizzle/0002_chubby_vance_astro.sql

@@ -1,7 +1,7 @@
 CREATE TABLE `image` (
-	`created_at` integer DEFAULT (current_timestamp),
-	`url` text NOT NULL,
-	`average` text NOT NULL,
-	`blurhash` text NOT NULL,
-	`mime` text NOT NULL
+  `created_at` integer DEFAULT (CURRENT_TIMESTAMP),
+  `url` text NOT NULL,
+  `average` text NOT NULL,
+  `blurhash` text NOT NULL,
+  `mime` text NOT NULL
 );

drizzle/0003_watery_purple_man.sql

@@ -1,7 +1,7 @@
 CREATE TABLE `document` (
-	`name` text NOT NULL,
-	`last_modified` integer NOT NULL,
-	`contentType` text NOT NULL,
-	`size` integer NOT NULL,
-	`perm` text NOT NULL
+  `name` text NOT NULL,
+  `last_modified` integer NOT NULL,
+  `contentType` text NOT NULL,
+  `size` integer NOT NULL,
+  `perm` text NOT NULL
 );

drizzle/0004_fat_captain_marvel.sql

@@ -1,13 +1,38 @@
-PRAGMA foreign_keys=OFF;--> statement-breakpoint
-CREATE TABLE `__new_document` (
-	`name` text PRIMARY KEY NOT NULL,
-	`last_modified` integer NOT NULL,
-	`contentType` text NOT NULL,
-	`size` integer NOT NULL,
-	`perm` text NOT NULL
-);
+PRAGMA foreign_keys = OFF;
+
 --> statement-breakpoint
-INSERT INTO `__new_document`("name", "last_modified", "contentType", "size", "perm") SELECT "name", "last_modified", "contentType", "size", "perm" FROM `document`;--> statement-breakpoint
-DROP TABLE `document`;--> statement-breakpoint
-ALTER TABLE `__new_document` RENAME TO `document`;--> statement-breakpoint
-PRAGMA foreign_keys=ON;
+CREATE TABLE `__new_document` (
+  `name` text PRIMARY KEY NOT NULL,
+  `last_modified` integer NOT NULL,
+  `contentType` text NOT NULL,
+  `size` integer NOT NULL,
+  `perm` text NOT NULL
+);
+
+--> statement-breakpoint
+INSERT INTO
+  `__new_document`(
+    "name",
+    "last_modified",
+    "contentType",
+    "size",
+    "perm"
+  )
+SELECT
+  "name",
+  "last_modified",
+  "contentType",
+  "size",
+  "perm"
+FROM
+  `document`;
+
+--> statement-breakpoint
+DROP TABLE `document`;
+
+--> statement-breakpoint
+ALTER TABLE
+  `__new_document` RENAME TO `document`;
+
+--> statement-breakpoint
+PRAGMA foreign_keys = ON;

drizzle/0005_illegal_roland_deschain.sql

@@ -1 +1,2 @@
-ALTER TABLE `document` RENAME COLUMN "contentType" TO "content_type";
+ALTER TABLE
+  `document` RENAME COLUMN "contentType" TO "content_type";

drizzle/0006_acoustic_the_initiative.sql

@@ -1 +1,4 @@
-ALTER TABLE `document` ADD `content` text;
+ALTER TABLE
+  `document`
+ADD
+  `content` text;

drizzle/0007_silly_synch.sql

@@ -1 +1,4 @@
-ALTER TABLE `document` ALTER COLUMN "content" TO "content" text NOT NULL;
+ALTER TABLE
+  `document`
+ALTER COLUMN
+  "content" TO "content" text NOT NULL;

drizzle/0008_loud_mephisto.sql

@@ -1 +1,4 @@
-ALTER TABLE `document` ALTER COLUMN "content" TO "content" text;
+ALTER TABLE
+  `document`
+ALTER COLUMN
+  "content" TO "content" text;

drizzle/0009_free_robin_chapel.sql

@@ -1,12 +1,17 @@
 CREATE TABLE `cache` (
-	`scope` text NOT NULL,
-	`key` text PRIMARY KEY NOT NULL,
-	`json` text,
-	`binary` blob,
-	`created_at` integer DEFAULT (current_timestamp),
-	`expires_at` integer
+  `scope` text NOT NULL,
+  `key` text PRIMARY KEY NOT NULL,
+  `json` text,
+  `binary` blob,
+  `created_at` integer DEFAULT (CURRENT_TIMESTAMP),
+  `expires_at` integer
 );
+
+--> statement-breakpoint
+CREATE INDEX `key_idx` ON `cache` (`key`);
+
+--> statement-breakpoint
+CREATE INDEX `scope_idx` ON `cache` (`scope`);
+
 --> statement-breakpoint
-CREATE INDEX `key_idx` ON `cache` (`key`);--> statement-breakpoint
-CREATE INDEX `scope_idx` ON `cache` (`scope`);--> statement-breakpoint
 CREATE INDEX `name_idx` ON `document` (`name`);

drizzle/0010_youthful_tyrannus.sql

@@ -1 +1,2 @@
-ALTER TABLE `image` RENAME COLUMN "blurhash" TO "thumbhash";
+ALTER TABLE
+  `image` RENAME COLUMN "blurhash" TO "thumbhash";

drizzle/0011_reflective_frank_castle.sql

@@ -0,0 +1,22 @@
+DROP INDEX "key_idx";
+
+--> statement-breakpoint
+DROP INDEX "scope_idx";
+
+--> statement-breakpoint
+DROP INDEX "name_idx";
+
+--> statement-breakpoint
+ALTER TABLE
+  `image`
+ALTER COLUMN
+  "created_at" TO "created_at" integer DEFAULT (unixepoch());
+
+--> statement-breakpoint
+CREATE INDEX `key_idx` ON `cache` (`key`);
+
+--> statement-breakpoint
+CREATE INDEX `scope_idx` ON `cache` (`scope`);
+
+--> statement-breakpoint
+CREATE INDEX `name_idx` ON `document` (`name`);

drizzle/meta/0011_snapshot.json

@@ -0,0 +1,309 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "11bbbc9d-3c0c-4fb9-893f-c87d5b8660d0",
+  "prevId": "685b57ca-45e0-4373-baee-fc3abb4f2d74",
+  "tables": {
+    "cache": {
+      "name": "cache",
+      "columns": {
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "json": {
+          "name": "json",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "binary": {
+          "name": "binary",
+          "type": "blob",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "(current_timestamp)"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "key_idx": {
+          "name": "key_idx",
+          "columns": [
+            "key"
+          ],
+          "isUnique": false
+        },
+        "scope_idx": {
+          "name": "scope_idx",
+          "columns": [
+            "scope"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "document": {
+      "name": "document",
+      "columns": {
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "last_modified": {
+          "name": "last_modified",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "content_type": {
+          "name": "content_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "perm": {
+          "name": "perm",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "name_idx": {
+          "name": "name_idx",
+          "columns": [
+            "name"
+          ],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "image": {
+      "name": "image",
+      "columns": {
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "(unixepoch())"
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "average": {
+          "name": "average",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "thumbhash": {
+          "name": "thumbhash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "mime": {
+          "name": "mime",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "performance": {
+      "name": "performance",
+      "columns": {
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "search": {
+          "name": "search",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "time": {
+          "name": "time",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "(STRFTIME('%s', 'now') * 1000)"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "session": {
+      "name": "session",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "(current_timestamp)"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "user": {
+      "name": "user",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(current_timestamp)"
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

drizzle/meta/_journal.json

@@ -78,6 +78,13 @@
       "when": 1762099260474,
       "tag": "0010_youthful_tyrannus",
       "breakpoints": true
+    },
+    {
+      "idx": 11,
+      "version": "6",
+      "when": 1768058169808,
+      "tag": "0011_reflective_frank_castle",
+      "breakpoints": true
     }
   ]
 }

fresh.config.ts

@@ -1,5 +0,0 @@
-import { defineConfig } from "$fresh/server.ts";
-import tailwind from "$fresh/plugins/tailwind.ts";
-export default defineConfig({
-  plugins: [tailwind()],
-});

fresh.gen.ts

@@ -1,138 +0,0 @@
-// DO NOT EDIT. This file is generated by Fresh.
-// This file SHOULD be checked into source version control.
-// This file is automatically updated during development when running `dev.ts`.
-
-import * as $_404 from "./routes/_404.tsx";
-import * as $_app from "./routes/_app.tsx";
-import * as $_layout from "./routes/_layout.tsx";
-import * as $_middleware from "./routes/_middleware.ts";
-import * as $admin_cache_index from "./routes/admin/cache/index.tsx";
-import * as $admin_log_index from "./routes/admin/log/index.tsx";
-import * as $admin_performance_index from "./routes/admin/performance/index.tsx";
-import * as $api_articles_name_ from "./routes/api/articles/[name].ts";
-import * as $api_articles_create_index from "./routes/api/articles/create/index.ts";
-import * as $api_articles_index from "./routes/api/articles/index.ts";
-import * as $api_auth_callback from "./routes/api/auth/callback.ts";
-import * as $api_auth_login from "./routes/api/auth/login.ts";
-import * as $api_auth_logout from "./routes/api/auth/logout.ts";
-import * as $api_cache from "./routes/api/cache.ts";
-import * as $api_images_index from "./routes/api/images/index.ts";
-import * as $api_index from "./routes/api/index.ts";
-import * as $api_logs from "./routes/api/logs.ts";
-import * as $api_movies_name_ from "./routes/api/movies/[name].ts";
-import * as $api_movies_enhance_name_ from "./routes/api/movies/enhance/[name].ts";
-import * as $api_movies_index from "./routes/api/movies/index.ts";
-import * as $api_query_index from "./routes/api/query/index.ts";
-import * as $api_recipes_name_ from "./routes/api/recipes/[name].ts";
-import * as $api_recipes_create_index from "./routes/api/recipes/create/index.ts";
-import * as $api_recipes_create_parseJsonLd from "./routes/api/recipes/create/parseJsonLd.ts";
-import * as $api_recipes_index from "./routes/api/recipes/index.ts";
-import * as $api_recommendation_all from "./routes/api/recommendation/all.ts";
-import * as $api_recommendation_data from "./routes/api/recommendation/data.ts";
-import * as $api_recommendation_index from "./routes/api/recommendation/index.ts";
-import * as $api_recommendation_movie_id_ from "./routes/api/recommendation/movie/[id].ts";
-import * as $api_series_name_ from "./routes/api/series/[name].ts";
-import * as $api_series_enhance_name_ from "./routes/api/series/enhance/[name].ts";
-import * as $api_series_index from "./routes/api/series/index.ts";
-import * as $api_tmdb_id_ from "./routes/api/tmdb/[id].ts";
-import * as $api_tmdb_credits_id_ from "./routes/api/tmdb/credits/[id].ts";
-import * as $api_tmdb_query from "./routes/api/tmdb/query.ts";
-import * as $articles_name_ from "./routes/articles/[name].tsx";
-import * as $articles_index from "./routes/articles/index.tsx";
-import * as $index from "./routes/index.tsx";
-import * as $movies_name_ from "./routes/movies/[name].tsx";
-import * as $movies_index from "./routes/movies/index.tsx";
-import * as $recipes_name_ from "./routes/recipes/[name].tsx";
-import * as $recipes_index from "./routes/recipes/index.tsx";
-import * as $series_name_ from "./routes/series/[name].tsx";
-import * as $series_index from "./routes/series/index.tsx";
-import * as $Counter from "./islands/Counter.tsx";
-import * as $IngredientsList from "./islands/IngredientsList.tsx";
-import * as $KMenu from "./islands/KMenu.tsx";
-import * as $KMenu_commands from "./islands/KMenu/commands.ts";
-import * as $KMenu_commands_add_movie_infos from "./islands/KMenu/commands/add_movie_infos.ts";
-import * as $KMenu_commands_add_series_infos from "./islands/KMenu/commands/add_series_infos.ts";
-import * as $KMenu_commands_create_article from "./islands/KMenu/commands/create_article.ts";
-import * as $KMenu_commands_create_movie from "./islands/KMenu/commands/create_movie.ts";
-import * as $KMenu_commands_create_recipe from "./islands/KMenu/commands/create_recipe.ts";
-import * as $KMenu_commands_create_recommendations from "./islands/KMenu/commands/create_recommendations.ts";
-import * as $KMenu_commands_create_series from "./islands/KMenu/commands/create_series.ts";
-import * as $KMenu_types from "./islands/KMenu/types.ts";
-import * as $Link from "./islands/Link.tsx";
-import * as $Recommendations from "./islands/Recommendations.tsx";
-import * as $Search from "./islands/Search.tsx";
-import type { Manifest } from "$fresh/server.ts";
-
-const manifest = {
-  routes: {
-    "./routes/_404.tsx": $_404,
-    "./routes/_app.tsx": $_app,
-    "./routes/_layout.tsx": $_layout,
-    "./routes/_middleware.ts": $_middleware,
-    "./routes/admin/cache/index.tsx": $admin_cache_index,
-    "./routes/admin/log/index.tsx": $admin_log_index,
-    "./routes/admin/performance/index.tsx": $admin_performance_index,
-    "./routes/api/articles/[name].ts": $api_articles_name_,
-    "./routes/api/articles/create/index.ts": $api_articles_create_index,
-    "./routes/api/articles/index.ts": $api_articles_index,
-    "./routes/api/auth/callback.ts": $api_auth_callback,
-    "./routes/api/auth/login.ts": $api_auth_login,
-    "./routes/api/auth/logout.ts": $api_auth_logout,
-    "./routes/api/cache.ts": $api_cache,
-    "./routes/api/images/index.ts": $api_images_index,
-    "./routes/api/index.ts": $api_index,
-    "./routes/api/logs.ts": $api_logs,
-    "./routes/api/movies/[name].ts": $api_movies_name_,
-    "./routes/api/movies/enhance/[name].ts": $api_movies_enhance_name_,
-    "./routes/api/movies/index.ts": $api_movies_index,
-    "./routes/api/query/index.ts": $api_query_index,
-    "./routes/api/recipes/[name].ts": $api_recipes_name_,
-    "./routes/api/recipes/create/index.ts": $api_recipes_create_index,
-    "./routes/api/recipes/create/parseJsonLd.ts":
-      $api_recipes_create_parseJsonLd,
-    "./routes/api/recipes/index.ts": $api_recipes_index,
-    "./routes/api/recommendation/all.ts": $api_recommendation_all,
-    "./routes/api/recommendation/data.ts": $api_recommendation_data,
-    "./routes/api/recommendation/index.ts": $api_recommendation_index,
-    "./routes/api/recommendation/movie/[id].ts": $api_recommendation_movie_id_,
-    "./routes/api/series/[name].ts": $api_series_name_,
-    "./routes/api/series/enhance/[name].ts": $api_series_enhance_name_,
-    "./routes/api/series/index.ts": $api_series_index,
-    "./routes/api/tmdb/[id].ts": $api_tmdb_id_,
-    "./routes/api/tmdb/credits/[id].ts": $api_tmdb_credits_id_,
-    "./routes/api/tmdb/query.ts": $api_tmdb_query,
-    "./routes/articles/[name].tsx": $articles_name_,
-    "./routes/articles/index.tsx": $articles_index,
-    "./routes/index.tsx": $index,
-    "./routes/movies/[name].tsx": $movies_name_,
-    "./routes/movies/index.tsx": $movies_index,
-    "./routes/recipes/[name].tsx": $recipes_name_,
-    "./routes/recipes/index.tsx": $recipes_index,
-    "./routes/series/[name].tsx": $series_name_,
-    "./routes/series/index.tsx": $series_index,
-  },
-  islands: {
-    "./islands/Counter.tsx": $Counter,
-    "./islands/IngredientsList.tsx": $IngredientsList,
-    "./islands/KMenu.tsx": $KMenu,
-    "./islands/KMenu/commands.ts": $KMenu_commands,
-    "./islands/KMenu/commands/add_movie_infos.ts":
-      $KMenu_commands_add_movie_infos,
-    "./islands/KMenu/commands/add_series_infos.ts":
-      $KMenu_commands_add_series_infos,
-    "./islands/KMenu/commands/create_article.ts":
-      $KMenu_commands_create_article,
-    "./islands/KMenu/commands/create_movie.ts": $KMenu_commands_create_movie,
-    "./islands/KMenu/commands/create_recipe.ts": $KMenu_commands_create_recipe,
-    "./islands/KMenu/commands/create_recommendations.ts":
-      $KMenu_commands_create_recommendations,
-    "./islands/KMenu/commands/create_series.ts": $KMenu_commands_create_series,
-    "./islands/KMenu/types.ts": $KMenu_types,
-    "./islands/Link.tsx": $Link,
-    "./islands/Recommendations.tsx": $Recommendations,
-    "./islands/Search.tsx": $Search,
-  },
-  baseUrl: import.meta.url,
-} satisfies Manifest;
-
-export default manifest;

islands/Counter.tsx

@@ -1,6 +1,6 @@
 import type { Signal } from "@preact/signals";
 import { Button } from "@components/Button.tsx";
-import { IconCircleMinus, IconCirclePlus } from "@components/icons.tsx";
+import { TbCircleMinus, TbCirclePlus } from "@preact-icons/tb";
 
 interface CounterProps {
   count: Signal<number>;
@@ -10,21 +10,21 @@ export default function Counter(props: CounterProps) {
   props.count.value = Math.max(1, props.count.value);
   return (
     <div class="flex items-center px-1 py-2 rounded-xl">
-      <Button
-        class=""
-        onClick={() => props.count.value -= 1}
-      >
-        <IconCircleMinus />
+      <Button onClick={() => props.count.value -= 1}>
+        <TbCircleMinus class="h-6 w-6" />
       </Button>
       <input
         class="text-3xl bg-transparent inline text-center -mx-4"
         type="number"
         size={props.count.toString().length}
         value={props.count}
-        onInput={(ev) => props.count.value = ev.target?.value}
+        onInput={(ev) => {
+          const target = ev.target as HTMLInputElement;
+          props.count.value = Math.max(1, Number(target.value));
+        }}
       />
       <Button onClick={() => props.count.value += 1}>
-        <IconCirclePlus />
+        <TbCirclePlus class="h-6 w-6" />
       </Button>
     </div>
   );

islands/IngredientsList.tsx

@@ -1,11 +1,10 @@
 import { Signal } from "@preact/signals";
 import type { Ingredient, IngredientGroup } from "@lib/recipeSchema.ts";
-import { FunctionalComponent } from "preact";
 import { unitsOfMeasure } from "@lib/parseIngredient.ts";
 
 function formatAmount(num: number) {
   if (num === 0) return "";
-  return (Math.floor(num * 4) / 4).toString();
+  return (Math.round(num * 4) / 4).toString();
 }
 
 function formatUnit(unit: string, amount: number) {
@@ -50,14 +49,12 @@ const Ingredient = (
   );
 };
 
-export const IngredientsList: FunctionalComponent<
-  {
+export const IngredientsList = (
+  { ingredients, amount, portion }: {
     ingredients: (Ingredient | IngredientGroup)[];
     amount: Signal<number>;
     portion?: number;
-  }
-> = (
-  { ingredients, amount, portion },
+  },
 ) => {
   return (
     <table class="w-full border-collapse table-auto">

islands/KMenu.tsx

@@ -4,7 +4,7 @@ import { useEventListener } from "@lib/hooks/useEventListener.ts";
 import { menus } from "@islands/KMenu/commands.ts";
 import { MenuEntry } from "@islands/KMenu/types.ts";
 import * as icons from "@components/icons.tsx";
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { isKMenuOpen } from "@lib/kmenu.ts";
 const KMenuEntry = (
   { entry, activeIndex, index }: {
     entry: MenuEntry;
@@ -21,7 +21,7 @@ const KMenuEntry = (
           : "text-gray-400"
       }`}
     >
-      {entry?.icon && icons[entry.icon]({ class: "w-4 h-4 mr-1" })}
+      {entry?.icon && icons[entry.icon]({ class: "min-w-4 h-4 mr-1" })}
       {entry.title}
     </div>
   );
@@ -42,7 +42,7 @@ export const KMenu = (
   const input = useRef<HTMLInputElement>(null);
   const commandInput = useSignal("");
 
-  const visible = useSignal(false);
+  const visible = isKMenuOpen;
   if (visible.value === false) {
     setTimeout(() => {
       activeMenuType.value = "main";
@@ -154,27 +154,29 @@ export const KMenu = (
     } else {
       input.current?.blur();
     }
-  }, IS_BROWSER ? document?.body : undefined);
+  }, typeof document !== "undefined" ? document?.body : undefined);
 
   return (
     <div
-      class={`${visible.value ? "opacity-100" : "opacity-0"} pointer-events-${
-        visible.value ? "auto" : "none"
+      class={`${visible.value ? "opacity-100" : "opacity-0"} ${
+        visible.value ? "pointer-events-auto" : "pointer-events-none"
       } transition grid place-items-center w-full h-full fixed top-0 left-0 z-50`}
       style={{ background: "#141217ee" }}
     >
       <div
-        class={`relative w-1/2 max-h-64 max-w-[400px] rounded-2xl shadow-2xl nnoisy-gradient overflow-hidden after:opacity-10 bg-gray-700`}
+        class={`relative w-1/2 max-h-64 max-w-100 rounded-2xl shadow-2xl nnoisy-gradient overflow-hidden after:opacity-10 bg-gray-700`}
         style={{ background: "#2B2930", color: "#818181" }}
       >
         <div
-          class={`grid h-12 text-gray-400 ${
-            activeState.value !== "loading" && "border-b"
+          class={`grid min-h-12 text-gray-400 ${
+            (activeState.value === "normal" || activeState.value === "input") &&
+            "border-b"
           } border-gray-500 `}
           style={{
-            gridTemplateColumns: activeState.value !== "loading"
-              ? "auto 1fr"
-              : "1fr",
+            gridTemplateColumns:
+              (activeState.value === "normal" || activeState.value === "input")
+                ? "auto 1fr"
+                : "1fr",
           }}
         >
           {(activeState.value === "normal" || activeState.value === "input") &&
@@ -198,12 +200,18 @@ export const KMenu = (
             )}
           {activeState.value === "loading" && (
             <div class="py-3 px-4 flex items-center gap-2">
-              <icons.IconLoader2 class="animate-spin w-4 h-4" />
+              <icons.IconLoader2 class="animate-spin min-w-4 h-4" />
               {loadingText.value || "Loading..."}
             </div>
           )}
+          {activeState.value === "error" && (
+            <div class="py-3 px-4 flex items-center gap-2 text-red-400">
+              <icons.IconAlertCircle class="min-w-4 h-4" />
+              {loadingText.value || "An error occurred"}
+            </div>
+          )}
         </div>
-        {activeState.value === "normal" &&
+        {(activeState.value === "normal" || activeState.value === "input") &&
           (
             <div
               class=""

islands/KMenu/commands.ts

@@ -5,8 +5,8 @@ import { createNewArticle } from "@islands/KMenu/commands/create_article.ts";
 import { getCookie } from "@lib/string.ts";
 import { addSeriesInfo } from "@islands/KMenu/commands/add_series_infos.ts";
 import { createNewSeries } from "@islands/KMenu/commands/create_series.ts";
-import { updateAllRecommendations } from "@islands/KMenu/commands/create_recommendations.ts";
 import { createNewRecipe } from "@islands/KMenu/commands/create_recipe.ts";
+import { enhanceArticleInfo } from "@islands/KMenu/commands/enhance_article_infos.ts";
 
 export const menus: Record<string, Menu> = {
   main: {
@@ -77,6 +77,7 @@ export const menus: Record<string, Menu> = {
       createNewSeries,
       createNewRecipe,
       addMovieInfos,
+      enhanceArticleInfo,
       // updateAllRecommendations,
     ],
   },

islands/KMenu/commands/add_movie_infos.ts

@@ -8,39 +8,61 @@ export const addMovieInfos: MenuEntry = {
   meta: "",
   icon: "IconReportSearch",
   cb: async (state, context) => {
-    state.activeState.value = "loading";
-    const movie = context as ReviewResource;
+    try {
+      state.activeState.value = "loading";
+      const movie = context as ReviewResource;
 
-    const query = movie.name;
+      const query = movie.name;
 
-    const response = await fetch(
-      `/api/tmdb/query?q=${encodeURIComponent(query)}`,
-    );
+      const response = await fetch(
+        `/api/tmdb/query?q=${encodeURIComponent(query)}`,
+      );
 
-    const json = await response.json() as TMDBMovie[];
+      if (!response.ok) {
+        throw new Error(await response.text());
+      }
 
-    const menuID = `result/${movie.name}`;
+      const json = await response.json() as TMDBMovie[];
 
-    state.menus[menuID] = {
-      title: "Select",
-      entries: json.map((m) => ({
-        title: `${m.title} released ${m.release_date}`,
-        cb: async () => {
-          state.activeState.value = "loading";
-          await fetch(`/api/movies/enhance/${movie.name}/`, {
-            method: "POST",
-            body: JSON.stringify({ tmdbId: m.id }),
-          });
-          state.visible.value = false;
-          state.activeState.value = "normal";
-          globalThis.location.reload();
-        },
-      })),
-    };
+      const menuID = `result/${movie.name}`;
 
-    state.activeMenu.value = menuID;
-    state.commandInput.value = "";
-    state.activeState.value = "normal";
+      state.menus[menuID] = {
+        title: "Select",
+        entries: json.map((m) => ({
+          title: `${m.title} released ${m.release_date}`,
+          cb: async () => {
+            try {
+              state.activeState.value = "loading";
+              await fetch(`/api/movies/enhance/${movie.name}/`, {
+                method: "POST",
+                body: JSON.stringify({ tmdbId: m.id }),
+              });
+              state.visible.value = false;
+              state.activeState.value = "normal";
+              globalThis.location.reload();
+            } catch (e) {
+              state.activeState.value = "error";
+              if (e instanceof Error) {
+                if ("message" in e) {
+                  state.loadingText.value = e.message;
+                }
+              }
+            }
+          },
+        })),
+      };
+
+      state.activeMenu.value = menuID;
+      state.commandInput.value = "";
+      state.activeState.value = "normal";
+    } catch (e) {
+      state.activeState.value = "error";
+      if (e instanceof Error) {
+        if ("message" in e) {
+          state.loadingText.value = e.message;
+        }
+      }
+    }
   },
   visible: () => {
     const loc = globalThis["location"];

islands/KMenu/commands/add_series_infos.ts

@@ -8,39 +8,61 @@ export const addSeriesInfo: MenuEntry = {
   meta: "",
   icon: "IconReportSearch",
   cb: async (state, context) => {
-    state.activeState.value = "loading";
-    const series = context as ReviewResource;
+    try {
+      state.activeState.value = "loading";
+      const series = context as ReviewResource;
 
-    const query = series.name;
+      const query = series.name;
 
-    const response = await fetch(
-      `/api/tmdb/query?q=${encodeURIComponent(query)}&type=serie`,
-    );
+      const response = await fetch(
+        `/api/tmdb/query?q=${encodeURIComponent(query)}&type=serie`,
+      );
 
-    const json = await response.json() as TMDBSeries[];
+      if (!response.ok) {
+        throw new Error(await response.text());
+      }
 
-    const menuID = `result/${series.name}`;
+      const json = await response.json() as TMDBSeries[];
 
-    state.menus[menuID] = {
-      title: "Select",
-      entries: json.map((m) => ({
-        title: `${m.name || m.original_name} released ${m.first_air_date}`,
-        cb: async () => {
-          state.activeState.value = "loading";
-          await fetch(`/api/series/enhance/${series.name}/`, {
-            method: "POST",
-            body: JSON.stringify({ tmdbId: m.id }),
-          });
-          state.visible.value = false;
-          state.activeState.value = "normal";
-          //window.location.reload();
-        },
-      })),
-    };
+      const menuID = `result/${series.name}`;
 
-    state.commandInput.value = "";
-    state.activeMenu.value = menuID;
-    state.activeState.value = "normal";
+      state.menus[menuID] = {
+        title: "Select",
+        entries: json.map((m) => ({
+          title: `${m.name || m.original_name} released ${m.first_air_date}`,
+          cb: async () => {
+            try {
+              state.activeState.value = "loading";
+              await fetch(`/api/series/enhance/${series.name}/`, {
+                method: "POST",
+                body: JSON.stringify({ tmdbId: m.id }),
+              });
+              state.visible.value = false;
+              state.activeState.value = "normal";
+              //window.location.reload();
+            } catch (e) {
+              state.activeState.value = "error";
+              if (e instanceof Error) {
+                if ("message" in e) {
+                  state.loadingText.value = e.message;
+                }
+              }
+            }
+          },
+        })),
+      };
+
+      state.commandInput.value = "";
+      state.activeMenu.value = menuID;
+      state.activeState.value = "normal";
+    } catch (e) {
+      state.activeState.value = "error";
+      if (e instanceof Error) {
+        if ("message" in e) {
+          state.loadingText.value = e.message;
+        }
+      }
+    }
   },
   visible: () => {
     const loc = globalThis["location"];

islands/KMenu/commands/create_article.ts

@@ -22,14 +22,16 @@ export const createNewArticle: MenuEntry = {
         state.activeState.value = "loading";
 
         fetchStream("/api/articles/create?url=" + value, (chunk) => {
-          if (chunk.startsWith("id:")) {
+          if (chunk.type === "error") {
+            state.activeState.value = "error";
+            state.loadingText.value = chunk.message;
+          } else if (chunk.type === "finished") {
             state.loadingText.value = "Finished";
             setTimeout(() => {
-              window.location.href = "/articles/" +
-                chunk.replace("id:", "").trim();
+              globalThis.location.href = "/articles/" + chunk.url;
             }, 500);
           } else {
-            state.loadingText.value = chunk;
+            state.loadingText.value = chunk.message;
           }
         });
       }

islands/KMenu/commands/create_movie.ts

@@ -31,35 +31,60 @@ export const createNewMovie: MenuEntry = {
 
     let currentQuery: string;
     const search = debounce(async function search(query: string) {
-      currentQuery = query;
-      if (query.length < 2) {
-        return;
+      try {
+        currentQuery = query;
+        if (query.length < 2) {
+          return;
+        }
+
+        const response = await fetch("/api/tmdb/query?q=" + query);
+
+        if (!response.ok) {
+          throw new Error(await response.text());
+        }
+
+        const movies = await response.json() as TMDBMovie[];
+
+        if (query !== currentQuery) return;
+
+        state.menus["input_link"] = {
+          title: "Search",
+          entries: movies.map((r) => {
+            return {
+              title: `${r.title} - ${r.release_date}`,
+              cb: async () => {
+                try {
+                  state.activeState.value = "loading";
+                  const response = await fetch("/api/movies/" + r.id, {
+                    method: "POST",
+                  });
+                  if (!response.ok) {
+                    throw new Error(await response.text());
+                  }
+                  const movie = await response.json() as ReviewResource;
+                  unsub();
+                  globalThis.location.href = "/movies/" + movie.name;
+                } catch (e) {
+                  state.activeState.value = "error";
+                  if (e instanceof Error) {
+                    if ("message" in e) {
+                      state.loadingText.value = e.message;
+                    }
+                  }
+                }
+              },
+            };
+          }),
+        };
+        state.activeMenu.value = "input_link";
+      } catch (e) {
+        state.activeState.value = "error";
+        if (e instanceof Error) {
+          if ("message" in e) {
+            state.loadingText.value = e.message;
+          }
+        }
       }
-
-      const response = await fetch("/api/tmdb/query?q=" + query);
-
-      const movies = await response.json() as TMDBMovie[];
-
-      if (query !== currentQuery) return;
-
-      state.menus["input_link"] = {
-        title: "Search",
-        entries: movies.map((r) => {
-          return {
-            title: `${r.title} - ${r.release_date}`,
-            cb: async () => {
-              state.activeState.value = "loading";
-              const response = await fetch("/api/movies/" + r.id, {
-                method: "POST",
-              });
-              const movie = await response.json() as ReviewResource;
-              unsub();
-              globalThis.location.href = "/movies/" + movie.name;
-            },
-          };
-        }),
-      };
-      state.activeMenu.value = "input_link";
     }, 500);
 
     const unsub = state.commandInput.subscribe((value) => {

islands/KMenu/commands/create_recipe.ts

@@ -21,15 +21,17 @@ export const createNewRecipe: MenuEntry = {
 
         state.activeState.value = "loading";
 
-        fetchStream("/api/recipes/create?url=" + value, (chunk) => {
-          if (chunk.startsWith("id:")) {
+        fetchStream("/api/recipes/create?url=" + value, (msg) => {
+          if (msg.type === "error") {
+            state.activeState.value = "error";
+            state.loadingText.value = msg.message;
+          } else if (msg.type === "finished") {
             state.loadingText.value = "Finished";
             setTimeout(() => {
-              globalThis.location.href = "/recipes/" +
-                chunk.replace("id:", "").trim();
+              globalThis.location.href = "/recipes/" + msg.url;
             }, 500);
           } else {
-            state.loadingText.value = chunk;
+            state.loadingText.value = msg.message;
           }
         });
       }

islands/KMenu/commands/create_recommendations.ts

@@ -10,12 +10,15 @@ export const updateAllRecommendations: MenuEntry = {
     state.activeState.value = "loading";
 
     fetchStream("/api/recommendation/all", (chunk) => {
-      if (chunk.toLowerCase().includes("finish")) {
+      if (chunk.type === "error") {
+        state.activeState.value = "error";
+        state.loadingText.value = chunk.message;
+      } else if (chunk.type === "finished") {
         setTimeout(() => {
-          window.location.reload();
+          globalThis.location.reload();
         }, 500);
       } else {
-        state.loadingText.value = chunk;
+        state.loadingText.value = chunk.message;
       }
     });
   },

islands/KMenu/commands/create_series.ts

@@ -31,38 +31,63 @@ export const createNewSeries: MenuEntry = {
 
     let currentQuery: string;
     const search = debounce(async function search(query: string) {
-      currentQuery = query;
-      if (query.length < 2) {
-        return;
+      try {
+        currentQuery = query;
+        if (query.length < 2) {
+          return;
+        }
+
+        const response = await fetch(
+          "/api/tmdb/query?q=" + query + "&type=series",
+        );
+
+        if (!response.ok) {
+          throw new Error(await response.text());
+        }
+
+        const series = await response.json() as TMDBSeries[];
+
+        if (query !== currentQuery) return;
+
+        state.menus["input_link"] = {
+          title: "Search",
+          entries: series.map((r) => {
+            return {
+              title: `${r.name} - ${r.first_air_date}`,
+              cb: async () => {
+                try {
+                  state.activeState.value = "loading";
+                  const response = await fetch("/api/series/" + r.id, {
+                    method: "POST",
+                  });
+                  if (!response.ok) {
+                    throw new Error(await response.text());
+                  }
+                  const series = await response.json() as ReviewResource;
+                  unsub();
+                  globalThis.location.href = "/series/" + series.name;
+                } catch (e) {
+                  state.activeState.value = "error";
+                  if (e instanceof Error) {
+                    if ("message" in e) {
+                      state.loadingText.value = e.message;
+                    }
+                  }
+                }
+              },
+            };
+          }),
+        };
+        state.commandInput.value = "";
+        state.activeMenu.value = "input_link";
+      } catch (e) {
+        state.activeState.value = "error";
+        if (e instanceof Error) {
+          if ("message" in e) {
+            state.loadingText.value = e.message;
+          }
+        }
       }
-
-      const response = await fetch(
-        "/api/tmdb/query?q=" + query + "&type=series",
-      );
-
-      const series = await response.json() as TMDBSeries[];
-
-      if (query !== currentQuery) return;
-
-      state.menus["input_link"] = {
-        title: "Search",
-        entries: series.map((r) => {
-          return {
-            title: `${r.name} - ${r.first_air_date}`,
-            cb: async () => {
-              state.activeState.value = "loading";
-              const response = await fetch("/api/series/" + r.id, {
-                method: "POST",
-              });
-              const series = await response.json() as ReviewResource;
-              unsub();
-              globalThis.location.href = "/series/" + series.name;
-            },
-          };
-        }),
-      };
-      state.commandInput.value = "";
-      state.activeMenu.value = "input_link";
     }, 500);
 
     const unsub = state.commandInput.subscribe((value) => {

islands/KMenu/commands/enhance_article_infos.ts

@@ -0,0 +1,41 @@
+import { getCookie } from "@lib/string.ts";
+import { MenuEntry } from "../types.ts";
+import { ArticleResource } from "@lib/marka/schema.ts";
+import { fetchStream } from "@lib/helpers.ts";
+
+export const enhanceArticleInfo: MenuEntry = {
+  title: "Enhance Article Info",
+  meta: "Update metadata and content from source url",
+  icon: "IconReportSearch",
+  cb: (state, context) => {
+    state.activeState.value = "loading";
+    const article = context as ArticleResource;
+
+    fetchStream(
+      `/api/articles/enhance/${article.name}/`,
+      (chunk) => {
+        if (chunk.type === "error") {
+          state.activeState.value = "error";
+          state.loadingText.value = chunk.message;
+        } else if (chunk.type == "finished") {
+          state.loadingText.value = "Finished";
+          setTimeout(() => {
+            state.visible.value = false;
+            state.activeState.value = "normal";
+            globalThis.location.reload();
+          }, 500);
+        } else {
+          state.loadingText.value = chunk.message;
+        }
+      },
+      { method: "POST" },
+    );
+  },
+  visible: () => {
+    const loc = globalThis["location"];
+    if (!getCookie("session_cookie")) return false;
+
+    return (loc?.pathname?.includes("article") &&
+      !loc.pathname.endsWith("articles"));
+  },
+};

islands/KMenuButton.tsx

@@ -0,0 +1,14 @@
+import { Button } from "@components/Button.tsx";
+import { IconMenu2 } from "@components/icons.tsx";
+import { isKMenuOpen } from "@lib/kmenu.ts";
+
+export default function KMenuButton() {
+  return (
+    <Button
+      class="fixed bottom-4 right-4 md:hidden bg-gray-800 text-white p-3 rounded-full shadow-lg z-50"
+      onClick={() => (isKMenuOpen.value = true)}
+    >
+      <IconMenu2 class="w-6 h-6" />
+    </Button>
+  );
+}

islands/Link.tsx

@@ -8,7 +8,7 @@ export function Link(
   props: {
     href?: string;
     class?: string;
-    style?: preact.JSX.CSSProperties;
+    style?: preact.CSSProperties;
     children: preact.ComponentChildren;
     "data-thumb"?: string;
   },

islands/Search.tsx

@@ -4,7 +4,7 @@ import { IconLoader2, IconSearch } from "@components/icons.tsx";
 import { useEventListener } from "@lib/hooks/useEventListener.ts";
 import { resources } from "@lib/resources.ts";
 import { getCookie } from "@lib/string.ts";
-import { IS_BROWSER } from "$fresh/runtime.ts";
+import { IS_BROWSER } from "fresh/runtime";
 import Checkbox from "@components/Checkbox.tsx";
 import { Rating } from "@components/Rating.tsx";
 import { useSignal } from "@preact/signals";
@@ -23,7 +23,7 @@ export async function fetchQueryResource(url: URL, type = "") {
       url.searchParams.set("status", "not-seen");
     }
     if (type) {
-      url.searchParams.set("types", type);
+      url.searchParams.set("type", type);
     }
     const response = await fetch(url);
     const jsonData = await response.json();
@@ -55,8 +55,8 @@ const SearchResultImage = ({ src }: { src: string }) => {
   return (
     <Image
       class="object-cover w-12 h-12 rounded-full"
-      width="50"
-      height="50"
+      width={100}
+      height={100}
       src={src}
       alt="preview image"
     />
@@ -114,6 +114,7 @@ const Search = (
   const searchQuery = useSignal(q);
   const data = useSignal<GenericResource[] | undefined>(results);
   const isLoading = useSignal(false);
+  const rating = useSignal<number | undefined>(undefined);
   const showSeenStatus = useSignal(false);
   const inputRef = useRef<HTMLInputElement>(null);
 
@@ -122,8 +123,10 @@ const Search = (
     if (u.searchParams.get("q") !== searchQuery.value) {
       u.searchParams.set("q", searchQuery.value);
     }
-    if (showSeenStatus.value) {
+    if (showSeenStatus.value === true) {
       u.searchParams.set("rating", "0");
+    } else if (rating.value) {
+      u.searchParams.set("rating", rating.value.toString());
     } else {
       u.searchParams.delete("rating");
     }
@@ -162,7 +165,7 @@ const Search = (
 
   useEffect(() => {
     debouncedFetchData(); // Call the debounced fetch function with the updated search query
-  }, [searchQuery.value, showSeenStatus.value]);
+  }, [searchQuery.value, showSeenStatus.value, rating.value]);
 
   useEffect(() => {
     debouncedFetchData();
@@ -187,8 +190,12 @@ const Search = (
             onInput={handleInputChange}
           />
         </div>
-        <Checkbox label="seen" checked={showSeenStatus} />
-        <Rating rating={4} />
+        <Checkbox label="unrated" checked={showSeenStatus} />
+        <div
+          class={showSeenStatus.value ? "opacity-10" : ""}
+        >
+          <Rating rating={rating} />
+        </div>
       </header>
       {data.value?.length && !isLoading.value
         ? <SearchResultList showEmoji={!type} result={data.value} />

lib/auth.ts

@@ -1,4 +1,4 @@
-import { OAuth2Client } from "https://deno.land/x/oauth2_client@v1.0.2/mod.ts";
+import { OAuth2Client } from "@cmd-johnson/oauth2-client";
 import {
   GITEA_CLIENT_ID,
   GITEA_CLIENT_SECRET,

lib/db/schema.ts

@@ -12,7 +12,9 @@ export const userTable = sqliteTable("user", {
   id: text()
     .primaryKey(),
   createdAt: integer("created_at", { mode: "timestamp" })
-    .default(sql`(current_timestamp)`)
+    .default(sql`
+      (CURRENT_TIMESTAMP)
+    `)
     .notNull(),
   email: text()
     .notNull(),
@@ -24,7 +26,9 @@ export const sessionTable = sqliteTable("session", {
   id: text("id")
     .primaryKey(),
   createdAt: integer("created_at", { mode: "timestamp_ms" }).default(
-    sql`(current_timestamp)`,
+    sql`
+      (CURRENT_TIMESTAMP)
+    `,
   ),
   expiresAt: integer("expires_at", { mode: "timestamp" })
     .notNull(),
@@ -38,12 +42,16 @@ export const performanceTable = sqliteTable("performance", {
   time: int().notNull(),
   createdAt: integer("created_at", {
     mode: "timestamp_ms",
-  }).default(sql`(STRFTIME('%s', 'now') * 1000)`),
+  }).default(sql`
+    (STRFTIME('%s', 'now') * 1000)
+  `),
 });
 
 export const imageTable = sqliteTable("image", {
   createdAt: integer("created_at", { mode: "timestamp" }).default(
-    sql`(current_timestamp)`,
+    sql`
+      (unixepoch())
+    `,
   ),
   url: text().notNull(),
   average: text().notNull(),
@@ -70,7 +78,9 @@ export const cacheTable = sqliteTable("cache", {
   json: text({ mode: "json" }),
   binary: blob(),
   createdAt: integer("created_at", { mode: "timestamp" }).default(
-    sql`(current_timestamp)`,
+    sql`
+      (CURRENT_TIMESTAMP)
+    `,
   ),
   expiresAt: integer("expires_at", { mode: "timestamp" }),
 }, (table) => {

lib/db/sqlite.ts

@@ -4,7 +4,6 @@ import path from "node:path";
 
 const DB_FILE = "file:" + path.resolve(DATA_DIR, "db.sqlite");
 
-// You can specify any property from the libsql connection options
 export const db = drizzle({
   connection: {
     url: DB_FILE,

lib/env.ts

@@ -7,6 +7,7 @@ export const PROXY_PASSWORD = Deno.env.get("PROXY_PASSWORD");
 export const TMDB_API_KEY = Deno.env.get("TMDB_API_KEY");
 export const OPENAI_API_KEY = Deno.env.get("OPENAI_API_KEY");
 export const YOUTUBE_API_KEY = Deno.env.get("YOUTUBE_API_KEY");
+export const UNSPLASH_API_KEY = Deno.env.get("UNSPLASH_API_KEY");
 export const TELEGRAM_API_KEY = Deno.env.get("TELEGRAM_API_KEY")!;
 
 export const GITEA_SERVER = Deno.env.get("GITEA_SERVER");
@@ -18,6 +19,7 @@ const duration = Deno.env.get("SESSION_DURATION");
 export const SESSION_DURATION = duration ? +duration : (60 * 60 * 24);
 
 export const MARKA_API_KEY = Deno.env.get("MARKA_API_KEY");
+export const MARKA_API_URL = Deno.env.get("MARKA_API_URL");
 
 export const JWT_SECRET = Deno.env.get("JWT_SECRET");
 

lib/errors.ts

@@ -1,8 +1,9 @@
-import { FreshContext } from "$fresh/server.ts";
+import { Context } from "fresh";
+import { State } from "../utils.ts";
 
 class DomainError extends Error {
   status = 500;
-  render?: (ctx: FreshContext) => void;
+  render?: (ctx: Context<State>) => void;
   constructor(public statusText = "Internal Server Error") {
     super();
   }

lib/helpers.ts

@@ -31,19 +31,54 @@ export const fixRenderedMarkdown = (content: string) => {
     });
 };
 
-export async function fetchStream(url: string, cb: (chunk: string) => void) {
-  const response = await fetch(url);
-  const reader = response?.body?.getReader();
-  if (reader) {
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) return;
-      const data = new TextDecoder().decode(value);
-      data
-        .split("$")
-        .filter((d) => d && d.length)
-        .map((d) => cb(Array.isArray(d) ? d[0] : d));
-    }
+type StreamMessage = {
+  type: "info";
+  message: string;
+} | {
+  type: "error";
+  message: string;
+} | {
+  type: "warning";
+  message: string;
+} | {
+  type: "finished";
+  url: string;
+};
+
+export async function fetchStream(
+  url: string,
+  cb: (chunk: StreamMessage) => void,
+  init?: RequestInit,
+) {
+  const res = await fetch(url, init);
+  if (!res.body) return;
+
+  let buffer = "";
+  const reader = res.body
+    .pipeThrough(new TextDecoderStream())
+    .pipeThrough(
+      new TransformStream<string, string>({
+        transform(chunk, controller) {
+          buffer += chunk;
+          let idx;
+          while ((idx = buffer.indexOf("\n")) >= 0) {
+            const line = buffer.slice(0, idx).trim();
+            buffer = buffer.slice(idx + 1);
+            if (line) controller.enqueue(line);
+          }
+        },
+        flush(controller) {
+          const line = buffer.trim();
+          if (line) controller.enqueue(line);
+        },
+      }),
+    )
+    .getReader();
+
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    cb(JSON.parse(value));
   }
 }
 
@@ -58,32 +93,53 @@ export function hashString(message: string) {
 }
 
 export const createStreamResponse = () => {
-  let controller: ReadableStreamController<ArrayBufferView>;
-  const body = new ReadableStream({
-    start(cont) {
-      controller = cont;
+  const encoder = new TextEncoder();
+  let controller: ReadableStreamDefaultController<Uint8Array>;
+
+  const body = new ReadableStream<Uint8Array>({
+    start(c) {
+      controller = c;
     },
   });
 
   const response = new Response(body, {
     headers: {
-      "content-type": "text/plain",
+      // newline-delimited JSON
+      "content-type": "application/x-ndjson; charset=utf-8",
+      // prevent intermediaries from buffering/transforming
+      "cache-control": "no-cache, no-transform",
       "x-content-type-options": "nosniff",
+      // nginx hint to disable proxy buffering
+      "x-accel-buffering": "no",
+      // if you control compression, keep it off for streams
+      // "content-encoding": "identity",
     },
   });
 
-  function cancel() {
-    controller.close();
+  const send = (obj: unknown) => {
+    controller.enqueue(encoder.encode(JSON.stringify(obj) + "\n")); // ← delimiter
+  };
+  const cancel = () => controller.close();
+
+  function info(message: string) {
+    return send({ type: "info", message });
   }
 
-  function enqueue(chunk: string) {
-    controller?.enqueue(new TextEncoder().encode("$" + chunk));
+  function error(message: string) {
+    return send({ type: "error", message });
+  }
+
+  function warning(message: string) {
+    return send({ type: "warning", message });
   }
 
   return {
     response,
     cancel,
-    enqueue,
+    send,
+    info,
+    error,
+    warning,
   };
 };
 

lib/image.ts

@@ -1,14 +1,13 @@
 import { rgbToHex } from "@lib/string.ts";
 import { createLogger } from "@lib/log/index.ts";
 import { generateThumbhash } from "@lib/thumbhash.ts";
-import { parseMediaType } from "https://deno.land/std@0.224.0/media_types/parse_media_type.ts";
+import { parseMediaType } from "@std/media-types";
 import path from "node:path";
 import { mkdir } from "node:fs/promises";
 import { DATA_DIR } from "@lib/env.ts";
 import { db } from "@lib/db/sqlite.ts";
 import { imageTable } from "@lib/db/schema.ts";
 import { eq } from "drizzle-orm";
-import sharp from "npm:sharp@next";
 
 const log = createLogger("cache/image");
 
@@ -158,6 +157,8 @@ async function resizeImage(
     mediaType: string;
   },
 ) {
+  const sharp = (await import("sharp")).default;
+
   try {
     log.debug("Resizing image", { params });
 
@@ -211,6 +212,8 @@ async function resizeImage(
 async function createThumbhash(
   image: Uint8Array,
 ): Promise<{ hash: string; average: string }> {
+  const sharp = (await import("sharp")).default;
+
   try {
     const resizedImage = await sharp(image)
       .resize(100, 100, { fit: "cover" }) // Keep aspect ratio within bounds
@@ -219,7 +222,11 @@ async function createThumbhash(
       .raw()
       .toBuffer();
 
-    const [hash, average] = generateThumbhash(resizedImage, 100, 100);
+    const [hash, average] = generateThumbhash(
+      new Uint8Array(resizedImage),
+      100,
+      100,
+    );
 
     return {
       hash: btoa(String.fromCharCode(...hash)),
@@ -234,6 +241,8 @@ async function createThumbhash(
  * Verifies that an image buffer contains valid image data
  */
 async function verifyImage(imageBuffer: Uint8Array): Promise<boolean> {
+  const sharp = (await import("sharp")).default;
+
   try {
     const metadata = await sharp(imageBuffer).metadata();
     return !!(metadata.width && metadata.height && metadata.format);

lib/kmenu.ts

@@ -0,0 +1,3 @@
+import { signal } from "@preact/signals";
+
+export const isKMenuOpen = signal(false);

lib/log/fs.ts

@@ -36,12 +36,12 @@ export async function getLogs() {
       .map((line) => {
         const [date, ...rest] = line.split(" | ");
         const parsed = JSON.parse(rest.join(" | ")) as Log;
+        const dateObj = new Date(date);
         return {
           ...parsed,
-          date: new Date(date),
+          date: isNaN(dateObj.getTime()) ? new Date() : dateObj,
         } as Log;
       });
-    console.log(logs);
 
     // Return the logs sorted by date
     return logs.sort((a, b) => a.date.getTime() - b.date.getTime());

lib/log/index.ts

@@ -38,13 +38,13 @@ export function createLogger(scope: string, _options?: LoggerOptions): Logger {
 export function loggerFromStream(stream: StreamResponse) {
   return {
     debug: (...data: unknown[]) =>
-      stream.enqueue(`${data.length > 1 ? data.join(" ") : data[0]}`),
+      stream.info(`${data.length > 1 ? data.join(" ") : data[0]}`),
     info: (...data: unknown[]) =>
-      stream.enqueue(`${data.length > 1 ? data.join(" ") : data[0]}`),
+      stream.info(`${data.length > 1 ? data.join(" ") : data[0]}`),
     error: (...data: unknown[]) =>
-      stream.enqueue(`[ERROR]: ${data.length > 1 ? data.join(" ") : data[0]}`),
+      stream.error(`[ERROR]: ${data.length > 1 ? data.join(" ") : data[0]}`),
     warn: (...data: unknown[]) =>
-      stream.enqueue(`[WARN]: ${data.length > 1 ? data.join(" ") : data[0]}`),
+      stream.warning(`[WARN]: ${data.length > 1 ? data.join(" ") : data[0]}`),
   };
 }
 

lib/marka/index.ts

@@ -1,10 +1,8 @@
-import { MARKA_API_KEY } from "../env.ts";
+import { createCache } from "../cache.ts";
+import { MARKA_API_KEY, MARKA_API_URL } from "../env.ts";
 import { getImage } from "../image.ts";
 import { GenericResource } from "./schema.ts";
 
-const url = `https://marka.max-richter.dev`;
-//const url = "http://localhost:8080";
-
 async function addImageToResource<T extends GenericResource>(
   resource: GenericResource,
 ): Promise<T> {
@@ -14,7 +12,7 @@ async function addImageToResource<T extends GenericResource>(
       const absoluteImageUrl = (imageUrl.startsWith("https://") ||
           imageUrl.startsWith("http://"))
         ? imageUrl
-        : `${url}/${imageUrl}`;
+        : `${MARKA_API_URL}/${imageUrl}`;
       const image = await getImage(absoluteImageUrl);
       return { ...resource, image } as T;
     } catch (e) {
@@ -24,34 +22,68 @@ async function addImageToResource<T extends GenericResource>(
   return resource as T;
 }
 
+type Resource = GenericResource & {
+  content: GenericResource["content"] & Array<GenericResource>;
+};
+
+const fetchCache = createCache<Resource>("marka");
+const cacheLock = new Map<string, Promise<Resource>>();
+
+async function fetchAndStoreUrl(url: string) {
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new Error(`Failed to fetch resource: ${response.status}`);
+  }
+  const res = await response.json();
+  fetchCache.set(url, res);
+  return res;
+}
+
+async function cachedFetch(
+  url: string,
+): Promise<Resource | undefined> {
+  if (fetchCache.has(url)) {
+    fetchAndStoreUrl(url); // Fetch the url in the background
+    return fetchCache.get(url);
+  }
+
+  if (cacheLock.has(url)) return cacheLock.get(url);
+
+  const response = fetchAndStoreUrl(url);
+  cacheLock.set(url, response);
+
+  const res = await response;
+  cacheLock.delete(url);
+  return res;
+}
+
 export async function fetchResource<T extends GenericResource>(
   resource: string,
 ): Promise<T | undefined> {
   try {
-    const response = await fetch(
-      `${url}/resources/${resource}`,
-    );
-    const res = await response.json();
+    const d = `${MARKA_API_URL}/resources/${resource}`;
+    const res = await cachedFetch(d);
+    if (!res) return;
     return addImageToResource<T>(res);
   } catch (_e) {
     return;
   }
 }
 
-export async function listResources<T = GenericResource>(
+export async function listResources<T extends GenericResource>(
   resource: string,
 ): Promise<T[]> {
   try {
-    const response = await fetch(
-      `${url}/resources/${resource}`,
-    );
-    const list = await response.json();
+    const d = `${MARKA_API_URL}/resources/${resource}`;
+    const list = await cachedFetch(d);
+    if (!list) return [];
     return Promise.all(
       list?.content
-        .filter((a: GenericResource) => a?.content?._type)
-        .map((res: GenericResource) => addImageToResource(res)),
+        .filter((a) => a?.content?._type)
+        .map((res) => addImageToResource(res) as Promise<T>),
     );
   } catch (_e) {
+    console.log(`Failed to fetch resource: ${resource}`, _e);
     return [];
   }
 }
@@ -62,7 +94,7 @@ export async function createResource(
 ) {
   const isJson = typeof content === "object" &&
     !(content instanceof ArrayBuffer);
-  const fetchUrl = `${url}/resources/${path}`;
+  const fetchUrl = `${MARKA_API_URL}/resources/${path}`;
   const headers = new Headers();
   headers.append("Content-Type", isJson ? "application/json" : "");
   if (MARKA_API_KEY) {
@@ -74,7 +106,12 @@ export async function createResource(
     body: isJson ? JSON.stringify(content) : content,
   });
   if (!response.ok) {
-    throw new Error(`Failed to create resource: ${response.status}`);
+    const text = await response.text();
+    throw new Error(
+      `failed to create resource (resources/${path}): ${
+        text || response.status
+      }`,
+    );
   }
   return response.json();
 }

lib/markdown.ts

@@ -1,7 +1,7 @@
 import { render } from "gfm";
-import "https://esm.sh/prismjs@1.29.0/components/prism-typescript?no-check";
-import "https://esm.sh/prismjs@1.29.0/components/prism-bash?no-check";
-import "https://esm.sh/prismjs@1.29.0/components/prism-rust?no-check";
+import "prismjs/components/prism-typescript.js";
+import "prismjs/components/prism-bash.js";
+import "prismjs/components/prism-rust.js";
 
 export type Document = {
   name: string;

lib/openai.ts

@@ -8,7 +8,7 @@ import { articleMetadataSchema } from "./marka/schema.ts";
 
 const openAI = OPENAI_API_KEY && new OpenAI({ apiKey: OPENAI_API_KEY });
 
-interface MovieRecommendation {
+export interface MovieRecommendation {
   year: number;
   title: string;
 }
@@ -181,20 +181,37 @@ respond with a plain unordered list each item starting with the year the movie w
 
   if (!res) return;
 
-  const recommendations = res.split("\n").map((entry) => {
+  const recommendations = res.split("\n").map((entry: string) => {
     const [year, ...title] = entry.split("-");
 
     return {
       year: parseInt(year.trim()),
       title: title.join(" ").replaceAll('"', "").trim(),
     };
-  }).filter((y) => !Number.isNaN(y.year));
+  }).filter((y: { year: number }) => !Number.isNaN(y.year));
 
   cache.set(cacheId, recommendations);
 
   return recommendations;
 };
 
+export async function createUnsplashSearchTerm(content: string) {
+  if (!openAI) return;
+  const chatCompletion = await openAI.chat.completions.create({
+    model: model,
+    messages: [
+      {
+        role: "system",
+        content:
+          "Please respond with a search term for unsplash for the following article",
+      },
+      { role: "user", content: content.slice(0, 10_000) },
+    ],
+  });
+
+  return chatCompletion.choices[0].message.content?.toLowerCase();
+}
+
 export async function createTags(content: string) {
   if (!openAI) return;
   const chatCompletion = await openAI.chat.completions.create({

lib/playwright.ts

@@ -1,6 +1,6 @@
-import { firefox } from "npm:playwright-extra";
+import { firefox } from "playwright-extra";
 import { createStreamResponse } from "@lib/helpers.ts";
-import StealthPlugin from "npm:puppeteer-extra-plugin-stealth";
+import StealthPlugin from "puppeteer-extra-plugin-stealth";
 import * as env from "@lib/env.ts";
 
 firefox.use(StealthPlugin());
@@ -9,7 +9,7 @@ export async function fetchHtmlWithPlaywright(
   fetchUrl: string,
   streamResponse: ReturnType<typeof createStreamResponse>,
 ): Promise<string> {
-  streamResponse.enqueue("booting up playwright");
+  streamResponse.info("booting up playwright");
 
   const config: Parameters<typeof firefox.launch>[0] = {};
   if (env.PROXY_SERVER) {
@@ -24,7 +24,7 @@ export async function fetchHtmlWithPlaywright(
   // Launch the Playwright browser
   const browser = await firefox.launch(config);
 
-  streamResponse.enqueue("fetching html");
+  streamResponse.info("fetching html");
 
   try {
     // Open a new browser context and page
@@ -42,7 +42,7 @@ export async function fetchHtmlWithPlaywright(
 
     return html;
   } catch (error) {
-    streamResponse.enqueue("error fetching html");
+    streamResponse.error("error fetching html");
     console.error(error);
     return "";
   } finally {

lib/promise.ts

@@ -1,105 +0,0 @@
-/**
- * Interface zur Beschreibung eines eingereihten Promises in der `PromiseQueue`.
- */
-interface QueuedPromise<T = any> {
-  promise: () => Promise<T>;
-  resolve: (value: T) => void;
-  reject: (reason?: any) => void;
-}
-
-/**
- * Eine einfache Promise Queue, die es ermöglicht mehrere Aufgaben in kontrollierter
- * Reihenfolge abzuarbeiten.
- *
- * Lizenz: CC BY-NC-SA 4.0
- * (c) Peter Müller <peter@crycode.de> (https://crycode.de/promise-queue-in-typescript)
- */
-export class PromiseQueue {
-  /**
-   * Eingereihte Promises.
-   */
-  private queue: QueuedPromise[] = [];
-
-  /**
-   * Indikator, dass aktuell ein Promise abgearbeitet wird.
-   */
-  private working = false;
-
-  /**
-   * Ein Promise einreihen.
-   * Dies fügt das Promise der Warteschlange hinzu. Wenn die Warteschlange leer
-   * ist, dann wird das Promise sofort gestartet.
-   * @param promise Funktion, die das Promise zurückgibt.
-   * @returns Ein Promise, welches eingelöst (oder zurückgewiesen) wird sobald das eingereihte Promise abgearbeitet ist.
-   */
-  public enqueue<T = void>(promise: () => Promise<T>): Promise<T> {
-    return new Promise((resolve, reject) => {
-      this.queue.push({
-        promise,
-        resolve,
-        reject,
-      });
-      this.dequeue();
-    });
-  }
-
-  /**
-   * Das erste Promise aus der Warteschlange holen und starten, sofern nicht
-   * bereits ein Promise aktiv ist.
-   * @returns `true` wenn ein Promise aus der Warteschlange gestartet wurde oder `false` wenn bereits ein Promise aktiv oder die Warteschlange leer ist.
-   */
-  private dequeue(): boolean {
-    if (this.working) {
-      return false;
-    }
-
-    const item = this.queue.shift();
-    if (!item) {
-      return false;
-    }
-
-    try {
-      this.working = true;
-      item.promise()
-        .then((value) => {
-          item.resolve(value);
-        })
-        .catch((err) => {
-          item.reject(err);
-        })
-        .finally(() => {
-          this.working = false;
-          this.dequeue();
-        });
-    } catch (err) {
-      item.reject(err);
-      this.working = false;
-      this.dequeue();
-    }
-
-    return true;
-  }
-}
-
-export class ConcurrentPromiseQueue {
-  /**
-   * Eingereihte Promises.
-   */
-  private queues: PromiseQueue[] = [];
-
-  constructor(concurrency: number = 1) {
-    this.queues = Array.from({ length: concurrency }).map(() => {
-      return new PromiseQueue();
-    });
-  }
-
-  private queueIndex = 0;
-  private getQueue() {
-    this.queueIndex = (this.queueIndex + 1) % this.queues.length;
-    return this.queues[this.queueIndex];
-  }
-
-  public enqueue<T = void>(promise: () => Promise<T>): Promise<T> {
-    return this.getQueue().enqueue(promise);
-  }
-}

lib/recipeSchema.ts

@@ -1,4 +1,4 @@
-import { z } from "npm:zod";
+import { z } from "zod";
 import { RecipeResource } from "./marka/schema.ts";
 
 export const IngredientSchema = z.object({
@@ -18,8 +18,9 @@ export const IngredientGroupSchema = z.object({
 export type IngredientGroup = z.infer<typeof IngredientGroupSchema>;
 
 const recipeSchema = z.object({
+  _type: z.literal("Recipe"),
   name: z.string().describe(
-    "Title of the Recipe, without the name of the website or author",
+    "Name of the Recipe, without the name of the website or author",
   ),
   description: z.string().describe(
     "Optional, short description of the recipe",
@@ -41,11 +42,7 @@ const recipeSchema = z.object({
 
 export type Recipe = z.infer<typeof recipeSchema>;
 
-const noRecipeSchema = z.object({
-  errorMessages: z.array(z.string()).describe(
-    "List of error messages, if no recipe was found",
-  ),
-});
+const noRecipeSchema = z.literal("none").describe("No Recipe found");
 
 export const recipeResponseSchema = z.union([recipeSchema, noRecipeSchema]);
 

lib/recommendation.ts

@@ -1,4 +1,5 @@
 import * as openai from "@lib/openai.ts";
+import { type MovieRecommendation } from "@lib/openai.ts";
 import * as tmdb from "@lib/tmdb.ts";
 import { parseRating } from "@lib/helpers.ts";
 import { createCache } from "@lib/cache.ts";
@@ -60,7 +61,9 @@ export async function createRecommendationResource(
     const d = typeof datePublished === "string"
       ? new Date(datePublished)
       : datePublished;
-    resource.year = d.getFullYear();
+    if (!isNaN(d.getTime())) {
+      resource.year = d.getFullYear();
+    }
   }
 
   cache.set(cacheId, JSON.stringify(resource));
@@ -74,7 +77,7 @@ export function getRecommendation(
 }
 
 export async function getSimilarMovies(id: string) {
-  const recs = getRecommendation(id, "movie");
+  const recs = getRecommendation(id, "movies");
   if (!recs?.keywords?.length) return;
 
   const recommendations = await openai.getMovieRecommendations(
@@ -83,10 +86,12 @@ export async function getSimilarMovies(id: string) {
   );
   if (!recommendations) return;
 
-  const movies = await Promise.all(recommendations.map(async (rec) => {
-    const m = await tmdb.searchMovie(rec.title, rec.year);
-    return m?.results?.[0];
-  }));
+  const movies = await Promise.all(
+    recommendations.map(async (rec: MovieRecommendation) => {
+      const m = await tmdb.searchMovie(rec.title, rec.year);
+      return m?.results?.[0];
+    }),
+  );
 
   return movies.filter(Boolean);
 }
@@ -96,5 +101,7 @@ export async function getAllRecommendations(): Promise<
 > {
   const keys = cache.keys();
   const res = await Promise.all(keys.map((k) => cache.get(k)));
-  return res.filter((s) => !!s).map((r) => JSON.parse(r));
+  return res.filter((s) => !!s).map((r) =>
+    typeof r === "string" ? JSON.parse(r) : r
+  );
 }

lib/resources.ts

@@ -1,26 +1,26 @@
 export const resources = {
   "home": {
-    emoji: "House with Garden.png",
+    emoji: "home_icon.png",
     name: "Home",
     link: "/",
   },
   "recipe": {
-    emoji: "Fork and Knife with Plate.png",
+    emoji: "recipes_icon.png",
     name: "Recipes",
     link: "/recipes",
   },
   "movie": {
-    emoji: "Popcorn.png",
+    emoji: "movies_icon.png",
     name: "Movies",
     link: "/movies",
   },
   "article": {
-    emoji: "Writing Hand Medium-Light Skin Tone.png",
+    emoji: "articles_icon.png",
     name: "Articles",
     link: "/articles",
   },
   "series": {
-    emoji: "Television.png",
+    emoji: "tv_series_icon.png",
     name: "Series",
     link: "/series",
   },

lib/search.ts

@@ -19,7 +19,7 @@ export function parseResourceUrl(_url: string | URL): SearchParams | undefined {
   try {
     const url = typeof _url === "string" ? new URL(_url) : _url;
     let query = url.searchParams.get("q") || "*";
-    if (!query) {
+    if (!(typeof query === "string")) {
       return undefined;
     }
     query = decodeURIComponent(query);
@@ -54,12 +54,14 @@ export async function searchResource(
   { q, tags = [], types, rating }: SearchParams,
 ): Promise<GenericResource[]> {
   const resources = (await Promise.all([
-    (!types || types.includes("movie")) && listResources("movies"),
+    (!types || types.includes("movies")) && listResources("movies"),
     (!types || types.includes("series")) && listResources("series"),
-    (!types || types.includes("article")) && listResources("articles"),
-    (!types || types.includes("recipe")) && listResources("recipes"),
+    (!types || types.includes("articles")) && listResources("articles"),
+    (!types || types.includes("recipes")) && listResources("recipes"),
   ])).flat().filter(isResource);
 
+  console.log({ types, rating, tags, q, resourceLength: resources.length });
+
   const results: Record<string, GenericResource> = {};
 
   for (const resource of resources) {
@@ -71,9 +73,18 @@ export async function searchResource(
       results[resource.name] = resource;
     }
 
+    // Select not-rated resources
     if (
-      !(resource.name in results) &&
-      rating && resource.content.reviewRating?.ratingValue &&
+      rating === 0 &&
+      resource.content?.reviewRating?.ratingValue === undefined
+    ) {
+      results[resource.name] = resource;
+    }
+
+    if (
+      typeof rating === "number" &&
+      rating !== 0 &&
+      resource.content.reviewRating?.ratingValue &&
       parseRating(resource.content.reviewRating.ratingValue) >= rating
     ) {
       results[resource.name] = resource;
@@ -81,6 +92,7 @@ export async function searchResource(
   }
 
   if (q.length && q !== "*") {
+    q = decodeURIComponent(q);
     const fuzzyResult = fuzzysort.go(q, resources, {
       keys: [
         "name",
@@ -92,6 +104,7 @@ export async function searchResource(
       ],
       threshold: 0.3,
     });
+    console.log({ fuzzyResult });
     for (const result of fuzzyResult) {
       results[result.obj.name] = result.obj;
     }

lib/string.ts

@@ -1,23 +1,37 @@
-export function formatDate(date: Date): string {
+export function formatDate(date?: string | Date): string {
+  if (!date) return "";
+  if (typeof date === "string") {
+    try {
+      const d = new Date(date);
+      return formatDate(d);
+    } catch (_e) {
+      return "";
+    }
+  }
   const options = { year: "numeric", month: "long", day: "numeric" } as const;
   return new Intl.DateTimeFormat("en-US", options).format(date);
 }
 
-export function safeFileName(inputString: string): string {
-  let fileName = inputString.toLowerCase();
-  fileName = fileName.replace(/ /g, "_");
-  fileName = fileName.replace(/[^\w.-]/g, "");
-  fileName = fileName.replaceAll(":", "");
-  return fileName;
+export function safeFileName(input: string): string {
+  return input
+    .normalize("NFKD")
+    .replace(/[\u0300-\u036f]/g, "")
+    .replace(/[\s-]+/g, "_")
+    .replace(/-+/g, "-")
+    .replace(/[^A-Za-z0-9_]+/g, "")
+    .replace(/_+/g, "_")
+    // Trim underscores/dots from ends and prevent leading dots
+    .replace(/^[_\.]+|[_\.]+$/g, "").replace(/^\.+/, "")
+    .toLowerCase();
 }
 
 export function toUrlSafeString(input: string): string {
   return input
-    .trim() // Remove leading and trailing whitespace
-    .toLowerCase() // Convert to lowercase
-    .replace(/[^a-z0-9\s-]/g, "") // Remove non-alphanumeric characters except spaces and hyphens
-    .replace(/\s+/g, "-") // Replace spaces with hyphens
-    .replace(/-+/g, "-"); // Remove consecutive hyphens
+    .normalize("NFKD")
+    .replace(/[\u0300-\u036f]/g, "")
+    .replace(/[^A-Za-z0-9 _-]+/g, "")
+    .replace(/\s+/g, " ")
+    .trim();
 }
 
 export function extractHashTags(inputString: string) {
@@ -172,3 +186,7 @@ export function removeMarkdownFormatting(text: string): string {
 
   return text;
 }
+
+export function fileExtension(fname: string) {
+  return fname.slice((fname.lastIndexOf(".") - 1 >>> 0) + 2);
+}

lib/taskManager.ts

@@ -1,110 +0,0 @@
-import { transcribe } from "@lib/openai.ts";
-import { createResource } from "@lib/marka/index.ts";
-import { createLogger } from "./log/index.ts";
-import { convertOggToMp3 } from "./helpers.ts";
-
-const log = createLogger("taskManager");
-
-// In-memory task state
-const activeTasks: Record<
-  string,
-  {
-    noteName: string;
-    entries: Array<
-      { type: string; content: string | ArrayBufferLike; fileName?: string }
-    >;
-  }
-> = {};
-
-export function startTask(chatId: string, noteName: string) {
-  activeTasks[chatId] = { noteName, entries: [] };
-  log.info(`Started note: ${noteName}`);
-}
-
-export async function endTask(chatId: string): Promise<string | null> {
-  const task = activeTasks[chatId];
-  if (!task) return null;
-
-  log.info("Ending note", task.noteName);
-
-  let finalNote = `# ${task.noteName}\n\n`;
-
-  const photoTasks: { content: ArrayBuffer; path: string }[] = [];
-
-  let photoIndex = 0;
-  for (const entry of task.entries) {
-    if (entry.type === "text") {
-      finalNote += entry.content + "\n\n";
-    } else if (entry.type === "voice") {
-      try {
-        log.info("Converting OGG to MP3");
-        const mp3Data = await convertOggToMp3(entry.content as ArrayBuffer);
-        log.info("Finished converting OGG to MP3, transcribing...");
-        const transcript = await transcribe(mp3Data);
-        finalNote += `**Voice Transcript:**\n${transcript}\n\n`;
-        log.info("Finished transcribing");
-      } catch (error) {
-        log.error(error);
-        finalNote += "**[Voice message could not be transcribed]**\n\n";
-      }
-    } else if (entry.type === "photo") {
-      const photoUrl = `${
-        task.noteName.replace(/\.md$/, "")
-      }/photo-${photoIndex++}.jpg`;
-
-      finalNote += `**Photo**:\n ${photoUrl}\n\n`;
-      photoTasks.push({
-        content: entry.content as ArrayBuffer,
-        path: photoUrl,
-      });
-    }
-  }
-
-  try {
-    for (const entry of photoTasks) {
-      await createResource(entry.path, entry.content);
-    }
-  } catch (err) {
-    log.error("Error creating photo document:", err);
-  }
-  try {
-    await createResource(task.noteName, finalNote);
-  } catch (error) {
-    log.error("Error creating document:", error);
-    return error instanceof Error
-      ? error.toString()
-      : "Error creating document";
-  }
-
-  delete activeTasks[chatId];
-  log.debug({ finalNote });
-  return finalNote;
-}
-
-export function addTextEntry(chatId: string, text: string) {
-  const task = activeTasks[chatId];
-  if (!task) return;
-  const entry = { type: "text", content: text };
-  log.debug("New Entry", entry);
-  task.entries.push(entry);
-}
-
-export function addVoiceEntry(chatId: string, buffer: ArrayBufferLike) {
-  const task = activeTasks[chatId];
-  if (!task) return;
-  const entry = { type: "voice", content: buffer };
-  log.debug("New Entry", entry);
-  task.entries.push(entry);
-}
-
-export function addPhotoEntry(
-  chatId: string,
-  buffer: ArrayBufferLike,
-  fileName: string,
-) {
-  const task = activeTasks[chatId];
-  if (!task) return;
-  const entry = { type: "photo", content: buffer, fileName };
-  log.debug("New Entry", entry);
-  task.entries.push(entry);
-}

lib/telegram.ts

@@ -1,65 +0,0 @@
-import { Bot } from "https://deno.land/x/grammy@v1.36.1/mod.ts";
-import { TELEGRAM_API_KEY } from "@lib/env.ts";
-import { createLogger } from "./log/index.ts";
-
-const bot = new Bot(TELEGRAM_API_KEY);
-const log = createLogger("telegram");
-
-import * as manager from "./taskManager.ts";
-
-async function downloadFile(filePath: string): Promise<Uint8Array> {
-  log.info(`Downloading file from path: ${filePath}`);
-  const url = `https://api.telegram.org/file/bot${bot.token}/${filePath}`;
-  const response = await fetch(url);
-  if (!response.ok) {
-    throw new Error("Failed to download file: " + response.statusText);
-  }
-  log.info("File downloaded successfully");
-  const buffer = await response.arrayBuffer();
-  return new Uint8Array(buffer);
-}
-
-bot.command("start", async (ctx) => {
-  log.info("Received /start command");
-  const [_, noteName] = ctx.message?.text?.split(" ") || [];
-  if (!noteName) {
-    return ctx.reply("Please provide a note name. Usage: /start NoteName");
-  }
-  manager.startTask(ctx.chat.id.toString(), noteName);
-  await ctx.reply(`Started note: ${noteName}`);
-});
-
-bot.command("end", async (ctx) => {
-  log.info("Received /end command");
-  const finalNote = await manager.endTask(ctx.chat.id.toString());
-  if (!finalNote) return ctx.reply("No active note found.");
-
-  try {
-    await ctx.reply("Note complete. Here is your markdown:");
-    await ctx.reply(finalNote, { parse_mode: "MarkdownV2" });
-  } catch (err) {
-    console.error("Error sending final note:", err);
-  }
-});
-
-bot.on("message:text", (ctx) => {
-  log.info("Received text message");
-  manager.addTextEntry(ctx.chat.id.toString(), ctx.message.text);
-});
-
-bot.on("message:voice", async (ctx) => {
-  log.info("Received photo message");
-  log.info("Received voice message");
-  const file = await ctx.getFile();
-  const buffer = await downloadFile(file.file_path!);
-  manager.addVoiceEntry(ctx.chat.id.toString(), buffer.buffer);
-});
-
-bot.on("message:photo", async (ctx) => {
-  const file = await ctx.getFile();
-  const buffer = await downloadFile(file.file_path!);
-  const fileName = file.file_path!.split("/").pop()!;
-  manager.addPhotoEntry(ctx.chat.id.toString(), buffer.buffer, fileName);
-});
-
-bot.start();

lib/thumbhash.ts

@@ -1,6 +1,10 @@
 import * as thumbhash from "thumbhash";
 
-export function generateThumbhash(buffer: Uint8Array, w: number, h: number) {
+export function generateThumbhash(
+  buffer: ArrayLike<number>,
+  w: number,
+  h: number,
+) {
   const hash = thumbhash.rgbaToThumbHash(w, h, buffer);
   return [hash, thumbhash.thumbHashToAverageRGBA(hash)] as const;
 }

lib/unsplash.ts

@@ -0,0 +1,29 @@
+import { UNSPLASH_API_KEY } from "./env.ts";
+
+const API_URL = "https://api.unsplash.com";
+
+export async function getImageBySearchTerm(
+  searchTerm: string,
+): Promise<string | undefined> {
+  if (!UNSPLASH_API_KEY) {
+    throw new Error("UNSPLASH_API_KEY is not set");
+  }
+
+  const url = new URL("/search/photos", API_URL);
+  url.searchParams.append("query", searchTerm);
+  url.searchParams.append("per_page", "1");
+  url.searchParams.append("orientation", "landscape");
+
+  const response = await fetch(url.toString(), {
+    headers: {
+      Authorization: `Client-ID ${UNSPLASH_API_KEY}`,
+    },
+  });
+
+  if (!response.ok) {
+    throw new Error(`Unsplash API request failed: ${response.statusText}`);
+  }
+
+  const data = await response.json();
+  return data.results[0]?.urls?.regular;
+}

lib/webScraper.ts

@@ -1,6 +1,8 @@
 import { JSDOM } from "jsdom";
 import { fetchHtmlWithPlaywright } from "./playwright.ts";
 import { createStreamResponse } from "./helpers.ts";
+import { Defuddle } from "defuddle/node";
+import TurndownService from "turndown";
 
 /**
  * Mutates the given JSDOM instance: rewrites all relevant URL-bearing attributes
@@ -45,7 +47,7 @@ export function absolutizeDomUrls(dom: JSDOM, domain: string): void {
 
   document
     .querySelectorAll("img[srcset], source[srcset]")
-    .forEach((el: HTMLImageElement) => {
+    .forEach((el) => {
       const v = el.getAttribute("srcset");
       if (!v) return;
       const abs = absolutizeSrcset(v, base);
@@ -53,7 +55,7 @@ export function absolutizeDomUrls(dom: JSDOM, domain: string): void {
     });
 
   document.querySelectorAll("[style]").forEach(
-    (el: HTMLElement) => {
+    (el) => {
       const v = el.getAttribute("style");
       if (!v) return;
       const abs = absolutizeCssUrls(v, base);
@@ -71,7 +73,7 @@ export function absolutizeDomUrls(dom: JSDOM, domain: string): void {
 
   document
     .querySelectorAll('meta[http-equiv="refresh" i][content]')
-    .forEach((meta: HTMLMetaElement) => {
+    .forEach((meta) => {
       const content = meta.getAttribute("content") || "";
       const abs = absolutizeMetaRefresh(content, base);
       if (abs !== content) meta.setAttribute("content", abs);
@@ -164,13 +166,32 @@ function absolutizeMetaRefresh(content: string, base: string): string {
   return `${delay}; url=${abs}`;
 }
 
+const turndownService = new TurndownService();
+
+export interface WebScrapeResult {
+  title?: string;
+  image?: string;
+  published?: string;
+  content: string;
+  schemaOrgData?: { author?: { name?: string } };
+  markdown: string;
+  dom: JSDOM["window"]["document"];
+}
+
 export async function webScrape(
   url: string,
   streamResponse: ReturnType<typeof createStreamResponse>,
-): JSDOM {
+) {
   const u = new URL(url);
   const html = await fetchHtmlWithPlaywright(url, streamResponse);
   const dom = new JSDOM(html);
   absolutizeDomUrls(dom, u.origin);
-  return dom;
+
+  const result = await Defuddle(dom, url);
+
+  return {
+    ...result,
+    dom: dom.window.document,
+    markdown: turndownService.turndown(result.content),
+  };
 }

lib/youtube.ts

@@ -56,12 +56,10 @@ export interface ContentDetails {
   definition: string;
   caption: string;
   licensedContent: boolean;
-  contentRating: ContentRating;
+  contentRating: Record<string, unknown>;
   projection: string;
 }
 
-export interface ContentRating {}
-
 export interface Statistics {
   viewCount: string;
   likeCount: string;
@@ -74,6 +72,11 @@ export interface PageInfo {
   resultsPerPage: number;
 }
 
+export async function getYoutubeVideoCover(id: string): Promise<ArrayBuffer> {
+  const res = await fetch(`https://i.ytimg.com/vi/${id}/maxresdefault.jpg`);
+  return res.arrayBuffer();
+}
+
 export async function getYoutubeVideoDetails(
   id: string,
 ): Promise<Item> {
@@ -81,6 +84,5 @@ export async function getYoutubeVideoDetails(
     `${BASE_URL}videos?part=snippet%2CcontentDetails%2Cstatistics&id=${id}&key=${YOUTUBE_API_KEY}`,
   );
   const json = await response.json();
-
   return json?.items[0];
 }

main.ts

@@ -1,12 +1,8 @@
-/// <reference no-default-lib="true" />
-/// <reference lib="dom" />
-/// <reference lib="dom.iterable" />
-/// <reference lib="dom.asynciterable" />
-/// <reference lib="deno.ns" />
+import { App, staticFiles } from "fresh";
+import { type State } from "./utils.ts";
 
-import { start } from "$fresh/server.ts";
-import manifest from "./fresh.gen.ts";
-import config from "./fresh.config.ts";
-// import "@lib/telegram.ts";
+export const app = new App<State>();
 
-await start(manifest, config);
+app.use(staticFiles());
+
+app.fsRoutes();

routes/_app.tsx

@@ -1,35 +1,47 @@
-import { PageProps } from "$fresh/server.ts";
-import { Partial } from "$fresh/runtime.ts";
-import { useEffect } from "preact/hooks";
-
-export default function App({ Component }: PageProps) {
-  const globalCss = Deno
-    .readTextFileSync("./static/global.css")
-    .replaceAll("\n", "");
+import { define } from "../utils.ts";
 
+export default define.page(function ({ Component }) {
   return (
     <html>
       <head>
         <link rel="stylesheet" href="/prism-material-dark.css" />
-        <link rel="stylesheet" href="/styles.css" />
         <link
           rel="icon"
           type="image/png"
           href="/favicon.png"
         />
         <link rel="manifest" href="/site.webmanifest" />
+        <link
+          rel="preload"
+          href="/fonts/work-sans-v18-latin-regular.woff2"
+          as="font"
+          type="font/woff2"
+        />
+        <link
+          rel="preload"
+          href="/fonts/work-sans-v18-latin-700.woff2"
+          as="font"
+          type="font/woff2"
+        />
+        <link rel="stylesheet" href="/global.css" />
+
         <meta name="msapplication-TileColor" content="#da532c" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <meta name="theme-color" content="#141218" />
-        <style>{globalCss}</style>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+        <style
+          dangerouslySetInnerHTML={{
+            __html: Deno.readTextFileSync("./static/global.css"),
+          }}
+        >
+        </style>
+
         <title>Memorium</title>
       </head>
-      <body f-client-nav>
-        <Partial name="body">
-          <Component />
-        </Partial>
+      <body>
+        <Component />
       </body>
-      <script src="/thumbhash.js" type="module" async defer />
     </html>
   );
-}
+});

routes/_error.tsx

@@ -1,7 +1,18 @@
-import { Head } from "$fresh/runtime.ts";
+import { Head } from "fresh/runtime";
 import { MainLayout } from "@components/layouts/main.tsx";
+import { HttpError, PageProps } from "fresh";
+
+export default function ErrorPage(props: PageProps) {
+  const error = props.error; // Contains the thrown Error or HTTPError
+  if (error instanceof HttpError) {
+    const status = error.status; // HTTP status code
+
+    // Render a 404 not found page
+    if (status === 404) {
+      return <h1>404 - Page not found</h1>;
+    }
+  }
 
-export default function Error404() {
   return (
     <>
       <Head>
@@ -9,7 +20,7 @@ export default function Error404() {
       </Head>
       <MainLayout url="">
         <div class="px-8 text-white mt-10">
-          <div class="max-w-screen-md mx-auto flex flex-col items-center justify-center">
+          <div class="max-w-3xl mx-auto flex flex-col items-center justify-center">
             <h1 class="text-4xl font-bold">404 - Page not found</h1>
             <p class="my-4">
               The page you were looking for doesn't exist.

routes/_layout.tsx

@@ -1,9 +1,10 @@
-import { PageProps } from "$fresh/server.ts";
 import { resources } from "@lib/resources.ts";
-import { Link } from "@islands/Link.tsx";
 import { Emoji } from "@components/Emoji.tsx";
+import KMenuButton from "@islands/KMenuButton.tsx";
+import { PageProps } from "fresh";
+import { define } from "../utils.ts";
 
-export default function MyLayout({ Component }: PageProps) {
+export default define.layout(function ({ Component }: PageProps) {
   return (
     <div
       class="md:grid mx-auto"
@@ -13,22 +14,20 @@ export default function MyLayout({ Component }: PageProps) {
         <nav class="min-h-fit rounded-3xl p-3 grid gap-3 fixed t-0">
           {Object.values(resources).map((m) => {
             return (
-              <Link
+              <a
                 href={m.link}
-                class="flex items-center gap-2  text-white data-[current]:bg-white data-[current]:text-black p-3 text-xl w-full rounded-2xl"
+                class="flex items-center gap-2 text-white data-current:bg-white data-current:text-black p-3 text-xl w-full rounded-2xl"
               >
                 <Emoji class="w-6 h-6" name={m.emoji} /> {m.name}
-              </Link>
+              </a>
             );
           })}
         </nav>
       </aside>
-      <main
-        class="py-5"
-        style={{ fontFamily: "Work Sans" }}
-      >
+      <main class="py-5">
         <Component />
       </main>
+      <KMenuButton />
     </div>
   );
-}
+});

routes/_middleware.ts

@@ -1,27 +1,39 @@
-//routes/middleware-error-handler/_middleware.ts
-import { FreshContext } from "$fresh/server.ts";
 import { DomainError } from "@lib/errors.ts";
 import { getCookies } from "@std/http/cookie";
-import { verify } from "https://deno.land/x/djwt@v2.2/mod.ts";
+import { verify } from "@zaubrik/djwt";
 import * as perf from "@lib/performance.ts";
 import { JWT_SECRET } from "@lib/env.ts";
+import { define } from "../utils.ts";
 
-export async function handler(
-  req: Request,
-  ctx: FreshContext,
+function importKey(secret: string) {
+  return crypto.subtle.importKey(
+    "raw",
+    new TextEncoder().encode(secret),
+    { name: "HMAC", hash: "SHA-512" },
+    false,
+    ["sign", "verify"],
+  );
+}
+
+const authMiddleware = define.middleware(async function (
+  ctx,
 ) {
+  const req = ctx.req;
+
   try {
     performance.mark("a");
     const allCookies = getCookies(req.headers);
     const sessionCookie = allCookies["session_cookie"];
     if (!ctx.state.session && sessionCookie && JWT_SECRET) {
       try {
-        const payload = await verify(sessionCookie, JWT_SECRET, "HS512");
+        const payload = await verify<typeof ctx.state.session>(
+          sessionCookie,
+          await importKey(JWT_SECRET),
+        );
         if (payload) {
           ctx.state.session = payload;
         }
       } catch (_err) {
-        //
         console.log({ _err });
       }
     }
@@ -44,4 +56,6 @@ export async function handler(
       status: 500,
     });
   }
-}
+});
+
+export default [authMiddleware];

routes/admin/cache/index.tsx

@@ -1,32 +0,0 @@
-import { MainLayout } from "@components/layouts/main.tsx";
-import { Handlers, PageProps } from "$fresh/server.ts";
-import { getCacheInfo } from "@lib/cache.ts";
-
-export const handler: Handlers<
-  { cacheInfo: ReturnType<typeof getCacheInfo> }
-> = {
-  GET(_, ctx) {
-    return ctx.render({ cacheInfo: getCacheInfo() });
-  },
-};
-
-export default function Greet(
-  props: PageProps<
-    { cacheInfo: ReturnType<typeof getCacheInfo> }
-  >,
-) {
-  const { cacheInfo } = props.data;
-  return (
-    <MainLayout
-      url={props.url}
-      title="Recipes"
-      context={{ type: "recipe" }}
-    >
-      <code>
-        <pre class="text-white">
-          {JSON.stringify(cacheInfo, null, 2)}
-        </pre>
-      </code>
-    </MainLayout>
-  );
-}

routes/admin/log/index.tsx

@@ -1,78 +0,0 @@
-import { MainLayout } from "@components/layouts/main.tsx";
-import { Handlers, PageProps } from "$fresh/server.ts";
-import { AccessDeniedError } from "@lib/errors.ts";
-import { getLogs, Log } from "@lib/log/index.ts";
-import { formatDate } from "@lib/string.ts";
-import { renderMarkdown } from "@lib/markdown.ts";
-
-const renderLog = (t: unknown) =>
-  renderMarkdown(`\`\`\`js
-${typeof t === "string" ? t : JSON.stringify(t, null, 2).trim()}
-\`\`\``);
-
-export const handler: Handlers = {
-  async GET(_, ctx) {
-    const logs = await getLogs();
-    if (!("session" in ctx.state)) {
-      throw new AccessDeniedError();
-    }
-    return ctx.render({
-      logs: logs.map((l) => {
-        return {
-          ...l,
-          html: l.args.map(renderLog).join("<br/>"),
-        };
-      }),
-    });
-  },
-};
-
-function LogLine(
-  { log }: {
-    log: Log & { html?: string };
-  },
-) {
-  return (
-    <div
-      class="mt-4 flex flex-col gap-2 bg-gray-900 px-4 py-2 rounded-2xl max-w-3xl"
-      style={{ background: "var(--light)" }}
-    >
-      <div class="flex gap-2">
-        <span class="bg-gray-600 py-1 px-2 text-xs rounded-xl text-white">
-          {log.date.getHours().toString().padStart(2, "0")}:{log.date
-            .getMinutes().toString().padStart(2, "0")}:{log.date.getSeconds()
-            .toString().padStart(2, "0")} {formatDate(log.date)}
-        </span>
-        <span class="bg-gray-600 py-1 px-2 text-xs rounded-xl text-white">
-          {log.scope}
-        </span>
-        <span class="bg-gray-600 py-1 px-2 text-xs rounded-xl text-white">
-          {log.level}
-        </span>
-      </div>
-      <div
-        class="text-white"
-        // deno-lint-ignore react-no-danger
-        dangerouslySetInnerHTML={{ __html: log.html ?? "" }}
-      />
-    </div>
-  );
-}
-
-export default function Greet(
-  { data: { logs }, url }: PageProps<{ logs: Log[] }>,
-) {
-  return (
-    <MainLayout url={url}>
-      <h1 class="text-white text-4xl">Logs</h1>
-
-      {logs.map((r) => {
-        return (
-          <LogLine
-            log={r}
-          />
-        );
-      })}
-    </MainLayout>
-  );
-}

routes/admin/performance/index.tsx

@@ -1,89 +0,0 @@
-import { MainLayout } from "@components/layouts/main.tsx";
-import { Handlers, PageProps } from "$fresh/server.ts";
-import { getPerformances, PerformanceRes } from "@lib/performance.ts";
-import { AccessDeniedError } from "@lib/errors.ts";
-
-export const handler: Handlers = {
-  async GET(_, ctx) {
-    const performances = await getPerformances();
-    if (!("session" in ctx.state)) {
-      throw new AccessDeniedError();
-    }
-
-    return ctx.render({ performances });
-  },
-};
-
-function PerformanceLine(
-  { maximum, data: [amount, min, average, max], url }: {
-    maximum: number;
-    url: string;
-    data: readonly [number, number, number, number];
-  },
-) {
-  return (
-    <div
-      class="mt-10 flex flex-col gap-2 bg-gray-900 px-4 py-2 rounded-2xl"
-      style={{ background: "var(--light)" }}
-    >
-      <div style={{ color: "var(--foreground)" }}>
-        {url}
-      </div>
-      <div class="flex gap-2">
-        <span class="bg-gray-600 p-1 text-xs rounded-xl text-white">
-          {Math.floor(average / 1000)}ms
-        </span>
-        <span class="bg-gray-600 p-1 text-xs rounded-xl text-white">
-          {amount}x
-        </span>
-      </div>
-      <div class="" style={{ maxWidth: "75vw" }}>
-        <div
-          class="h-2 bg-red-200 rounded"
-          style={{
-            width: `${Math.floor((max / maximum) * 100)}%`,
-            borderRadius: "1rem 1rem 1rem 0px",
-            minWidth: "5px",
-          }}
-        />
-        <div
-          class="h-2  bg-green-200 rounded"
-          style={{
-            width: `${Math.floor((average / maximum) * 100)}%`,
-            borderStartEndRadius: "0px",
-            borderRadius: "0px 0px 1rem 0px",
-            minWidth: "5px",
-          }}
-        />
-        <div
-          class="h-2  bg-yellow-200 rounded"
-          style={{
-            width: `${Math.floor((min / maximum) * 100)}%`,
-            borderRadius: "0px 0px 1rem 1rem",
-            minWidth: "5px",
-          }}
-        />
-      </div>
-    </div>
-  );
-}
-
-export default function Greet(
-  { data: { performances }, url }: PageProps<{ performances: PerformanceRes }>,
-) {
-  return (
-    <MainLayout url={url}>
-      <h1 class="text-white text-4xl ">Performance</h1>
-
-      {performances.res.map((r) => {
-        return (
-          <PerformanceLine
-            maximum={performances.max}
-            url={r.url}
-            data={r.data}
-          />
-        );
-      })}
-    </MainLayout>
-  );
-}

routes/api/articles/[name].ts

@@ -1,10 +1,10 @@
-import { Handlers } from "$fresh/server.ts";
 import { json } from "@lib/helpers.ts";
 import { fetchResource } from "@lib/marka/index.ts";
+import { define } from "../../../utils.ts";
 
-export const handler: Handlers = {
-  async GET(_, ctx) {
+export const handler = define.handlers({
+  async GET(ctx) {
     const article = await fetchResource(`articles/${ctx.params.name}`);
     return json(article);
   },
-};
+});

routes/api/articles/create/index.ts

@@ -1,21 +1,79 @@
-import { Handlers } from "$fresh/server.ts";
-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 * as unsplash from "@lib/unsplash.ts";
 import { getYoutubeVideoDetails } from "@lib/youtube.ts";
 import {
   extractYoutubeId,
+  fileExtension,
+  formatDate,
   isYoutubeLink,
+  safeFileName,
   toUrlSafeString,
 } from "@lib/string.ts";
 import { createLogger } from "@lib/log/index.ts";
 import { createResource } from "@lib/marka/index.ts";
 import { webScrape } from "@lib/webScraper.ts";
 import { ArticleResource } from "@lib/marka/schema.ts";
+import { define } from "../../../../utils.ts";
 
 const log = createLogger("api/article");
 
+async function getUnsplashCoverImage(
+  content: string,
+  streamResponse: ReturnType<typeof createStreamResponse>,
+): Promise<string | undefined> {
+  try {
+    streamResponse.info("creating unsplash search term");
+    const searchTerm = await openai.createUnsplashSearchTerm(content);
+    if (!searchTerm) return;
+    streamResponse.info(`searching for ${searchTerm}`);
+    const unsplashUrl = await unsplash.getImageBySearchTerm(searchTerm);
+    return unsplashUrl;
+  } catch (e) {
+    log.error("Failed to get unsplash cover image", e);
+    return undefined;
+  }
+}
+
+function ext(str: string) {
+  try {
+    const u = new URL(str);
+    if (u.searchParams.has("fm")) {
+      return u.searchParams.get("fm")!;
+    }
+    return fileExtension(u.pathname);
+  } catch (_e) {
+    return fileExtension(str);
+  }
+}
+
+async function fetchAndStoreCover(
+  imageUrl: string | undefined,
+  title: string,
+  streamResponse?: ReturnType<typeof createStreamResponse>,
+): Promise<string | undefined> {
+  if (!imageUrl) return;
+  const imagePath = `articles/images/${safeFileName(title)}_cover.${
+    ext(imageUrl)
+  }`;
+  try {
+    streamResponse?.info("downloading image");
+    const res = await fetch(imageUrl);
+    streamResponse?.info("saving image");
+    if (!res.ok) {
+      console.log(`Failed to download remote image: ${imageUrl}`, res.status);
+      return;
+    }
+    const buffer = await res.arrayBuffer();
+    await createResource(imagePath, buffer);
+    return `resources/${imagePath}`;
+  } catch (err) {
+    console.log(`Failed to save image: ${imageUrl}`, err);
+    return;
+  }
+}
+
 async function processCreateArticle(
   { fetchUrl, streamResponse }: {
     fetchUrl: string;
@@ -24,39 +82,53 @@ async function processCreateArticle(
 ) {
   log.info("create article from url", { url: fetchUrl });
 
-  streamResponse.enqueue("downloading article");
+  streamResponse.info("downloading article");
 
-  const doc = await webScrape(fetchUrl, streamResponse);
+  const scrapeResult = await webScrape(fetchUrl, streamResponse);
 
-  const result = await Defuddle(doc, fetchUrl, {
-    markdown: true,
-  });
+  log.debug("downloaded and parse parsed", scrapeResult);
 
-  log.debug("downloaded and parse parsed", {
-    url: fetchUrl,
-    content: result.content,
-  });
+  streamResponse.info("parsed article, creating tags with openai");
 
-  streamResponse.enqueue("parsed article, creating tags with openai");
+  const aiMeta = await openai.extractArticleMetadata(scrapeResult.markdown);
 
-  const aiMeta = await openai.extractArticleMetadata(result.content);
+  streamResponse.info("postprocessing article");
 
-  streamResponse.enqueue("postprocessing article");
+  const title = scrapeResult?.title || aiMeta?.headline || "";
 
-  const title = result?.title || aiMeta?.headline || "";
-  const id = toUrlSafeString(title);
+  let coverImagePath: string | undefined = undefined;
+  if (scrapeResult?.image?.length) {
+    log.debug("using local image for cover image", {
+      image: scrapeResult.image,
+    });
+    coverImagePath = await fetchAndStoreCover(
+      scrapeResult.image,
+      title,
+      streamResponse,
+    );
+  } else {
+    const urlPath = await getUnsplashCoverImage(
+      scrapeResult.markdown,
+      streamResponse,
+    );
+    coverImagePath = await fetchAndStoreCover(urlPath, title, streamResponse);
+    log.debug("using unsplash for cover image", { image: coverImagePath });
+  }
+
+  const url = toUrlSafeString(title);
 
   const newArticle: ArticleResource["content"] = {
     _type: "Article",
     headline: title,
-    articleBody: result.content,
+    articleBody: scrapeResult.markdown,
     url: fetchUrl,
-    datePublished: result?.published || aiMeta?.datePublished ||
-      new Date().toISOString(),
-    image: result?.image,
+    datePublished: formatDate(
+      scrapeResult?.published || aiMeta?.datePublished || undefined,
+    ),
+    image: coverImagePath,
     author: {
       _type: "Person",
-      name: (result.schemaOrgData?.author?.name || aiMeta?.author || "")
+      name: (scrapeResult.schemaOrgData?.author?.name || aiMeta?.author || "")
         .replace(
           "@",
           "twitter:",
@@ -64,11 +136,16 @@ async function processCreateArticle(
     },
   } as const;
 
-  streamResponse.enqueue("writing to disk");
+  streamResponse.info("writing to disk");
 
-  await createResource(`articles/${id}.md`, newArticle);
+  log.debug("writing to disk", {
+    ...newArticle,
+    articleBody: newArticle.articleBody?.slice(0, 200),
+  });
 
-  streamResponse.enqueue("id: " + id);
+  await createResource(`articles/${url}.md`, newArticle);
+
+  streamResponse.send({ type: "finished", url });
 }
 
 async function processCreateYoutubeVideo(
@@ -81,40 +158,53 @@ async function processCreateYoutubeVideo(
     url: fetchUrl,
   });
 
-  streamResponse.enqueue("getting video infos from youtube api");
+  streamResponse.info("getting video infos from youtube api");
 
   const youtubeId = extractYoutubeId(fetchUrl);
 
   const video = await getYoutubeVideoDetails(youtubeId);
 
-  streamResponse.enqueue("shortening title with openai");
-  const newId = await openai.shortenTitle(video.snippet.title);
+  streamResponse.info("shortening title with openai");
+  const videoTitle = await openai.shortenTitle(video.snippet.title) ||
+    video.snippet.title;
 
-  const id = newId || youtubeId;
+  const thumbnail = video?.snippet?.thumbnails?.maxres;
+  const coverImagePath = await fetchAndStoreCover(
+    thumbnail.url,
+    videoTitle || video.snippet.title,
+    streamResponse,
+  );
 
   const newArticle: ArticleResource["content"] = {
     _type: "Article",
     headline: video.snippet.title,
     articleBody: video.snippet.description,
+    image: coverImagePath,
     url: fetchUrl,
-    datePublished: new Date(video.snippet.publishedAt).toISOString(),
+    datePublished: formatDate(video.snippet.publishedAt),
     author: {
       _type: "Person",
       name: video.snippet.channelTitle,
     },
   };
 
-  streamResponse.enqueue("creating article");
+  streamResponse.info("creating article");
 
-  await createResource(`articles/${id}.md`, newArticle);
+  const filename = toUrlSafeString(videoTitle);
 
-  streamResponse.enqueue("finished");
+  await createResource(
+    `articles/${filename}.md`,
+    newArticle,
+  );
 
-  streamResponse.enqueue("id: " + id);
+  streamResponse.info("finished");
+
+  streamResponse.send({ type: "finished", url: filename });
 }
 
-export const handler: Handlers = {
-  GET(req, ctx) {
+export const handler = define.handlers({
+  GET(ctx) {
+    const req = ctx.req;
     const session = ctx.state.session;
     if (!session) {
       throw new AccessDeniedError();
@@ -151,4 +241,4 @@ export const handler: Handlers = {
 
     return streamResponse.response;
   },
-};
+});

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

@@ -0,0 +1,185 @@
+import { fileExtension, formatDate, safeFileName } from "@lib/string.ts";
+import { createStreamResponse } from "@lib/helpers.ts";
+import {
+  AccessDeniedError,
+  BadRequestError,
+  NotFoundError,
+} from "@lib/errors.ts";
+import { createResource, fetchResource } from "@lib/marka/index.ts";
+import { ArticleResource } from "@lib/marka/schema.ts";
+import { webScrape } from "@lib/webScraper.ts";
+import * as openai from "@lib/openai.ts";
+import * as unsplash from "@lib/unsplash.ts";
+import { createLogger } from "@lib/log/index.ts";
+import { define } from "../../../../utils.ts";
+
+function ext(str: string) {
+  try {
+    const u = new URL(str);
+    if (u.searchParams.has("fm")) {
+      return u.searchParams.get("fm")!;
+    }
+    return fileExtension(u.pathname);
+  } catch (_e) {
+    return fileExtension(str);
+  }
+}
+
+const log = createLogger("api/article/enhance");
+
+async function getUnsplashCoverImage(
+  content: string,
+  streamResponse: ReturnType<typeof createStreamResponse>,
+): Promise<string | undefined> {
+  try {
+    streamResponse.info("creating unsplash search term");
+    const searchTerm = await openai.createUnsplashSearchTerm(content);
+    if (!searchTerm) return;
+    streamResponse.info(`searching for ${searchTerm}`);
+    const unsplashUrl = await unsplash.getImageBySearchTerm(searchTerm);
+    return unsplashUrl;
+  } catch (e) {
+    log.error("Failed to get unsplash cover image", e);
+    return undefined;
+  }
+}
+
+async function fetchAndStoreCover(
+  imageUrl: string | undefined,
+  title: string,
+  streamResponse: ReturnType<typeof createStreamResponse>,
+): Promise<string | undefined> {
+  if (!imageUrl) return;
+  const imagePath = `articles/images/${safeFileName(title)}_cover.${
+    ext(imageUrl)
+  }`;
+  try {
+    streamResponse.info("downloading cover");
+    const res = await fetch(imageUrl);
+    if (!res.ok) {
+      log.error(`Failed to download remote image: ${imageUrl}`, {
+        status: res.status,
+      });
+      return;
+    }
+    const buffer = await res.arrayBuffer();
+    streamResponse.info("saving cover");
+    await createResource(imagePath, buffer);
+    return `resources/${imagePath}`;
+  } catch (err) {
+    log.error(`Failed to save image: ${imageUrl}`, err);
+    return;
+  }
+}
+
+async function processEnhanceArticle(
+  name: string,
+  streamResponse: ReturnType<typeof createStreamResponse>,
+) {
+  const article = await fetchResource<ArticleResource>(
+    `articles/${name}`,
+  );
+  if (!article) {
+    throw new NotFoundError();
+  }
+
+  const fetchUrl = article.content?.url;
+  if (!fetchUrl) {
+    throw new BadRequestError("Article has no URL to enhance from.");
+  }
+
+  log.info("enhancing article from url", { url: fetchUrl });
+  streamResponse.info("scraping url");
+  const result = await webScrape(fetchUrl, streamResponse);
+
+  streamResponse.info("parsing content");
+
+  log.debug("downloaded and parsed", result);
+
+  streamResponse.info("extracting metadata with openai");
+  const aiMeta = await openai.extractArticleMetadata(result.markdown);
+
+  const title = result?.title || aiMeta?.headline ||
+    article.content?.headline || "";
+
+  article.content ??= {
+    _type: "Article",
+    headline: title,
+    url: fetchUrl,
+  };
+
+  article.content.articleBody = result.markdown;
+  article.content.datePublished ??= formatDate(
+    result?.published || aiMeta?.datePublished || undefined,
+  );
+
+  if (!article.content.author?.name || article.content.author.name === "") {
+    article.content.author = {
+      _type: "Person",
+      name: (result.schemaOrgData?.author?.name || aiMeta?.author || "")
+        .replace(
+          "@",
+          "twitter:",
+        ),
+    };
+  }
+
+  if (!article.content.image) {
+    let coverImagePath: string | undefined = undefined;
+    if (result?.image?.length) {
+      log.debug("using local image for cover image", { image: result.image });
+      coverImagePath = await fetchAndStoreCover(
+        result.image,
+        title,
+        streamResponse,
+      );
+    } else {
+      const urlPath = await getUnsplashCoverImage(
+        result.content,
+        streamResponse,
+      );
+      coverImagePath = await fetchAndStoreCover(urlPath, title, streamResponse);
+      log.debug("using unsplash for cover image", { image: coverImagePath });
+    }
+    if (coverImagePath) {
+      article.content.image = coverImagePath;
+    }
+  }
+
+  log.debug("writing to disk", {
+    name: name,
+    article: {
+      ...article,
+      content: {
+        ...article.content,
+        articleBody: article.content.articleBody?.slice(0, 200),
+      },
+    },
+  });
+
+  streamResponse.info("writing to disk");
+  await createResource(`articles/${name}`, article.content);
+  streamResponse.send({ type: "finished", url: name.replace(/$\.md/, "") });
+}
+
+export const handler = define.handlers({
+  POST: (ctx) => {
+    const session = ctx.state.session;
+    if (!session) {
+      throw new AccessDeniedError();
+    }
+
+    const streamResponse = createStreamResponse();
+
+    processEnhanceArticle(ctx.params.name, streamResponse)
+      .catch((err) => {
+        log.error(err);
+        streamResponse.error(err.message);
+      })
+      .finally(() => {
+        streamResponse.cancel();
+      });
+
+    return streamResponse.response;
+  },
+});

routes/api/articles/index.ts

@@ -1,10 +1,10 @@
-import { Handlers } from "$fresh/server.ts";
 import { json } from "@lib/helpers.ts";
 import { fetchResource } from "@lib/marka/index.ts";
+import { define } from "../../../utils.ts";
 
-export const handler: Handlers = {
+export const handler = define.handlers({
   async GET() {
     const articles = await fetchResource("articles");
     return json(articles?.content);
   },
-};
+});

routes/api/auth/callback.ts

@@ -1,5 +1,4 @@
-import { Handlers } from "$fresh/server.ts";
-import { create, getNumericDate } from "https://deno.land/x/djwt@v2.2/mod.ts";
+import { create, getNumericDate } from "@zaubrik/djwt";
 import { oauth2Client } from "@lib/auth.ts";
 import { getCookies, setCookie } from "@std/http/cookie";
 import { codeChallengeMap } from "./login.ts";
@@ -9,15 +8,16 @@ import { BadRequestError } from "@lib/errors.ts";
 import { db } from "@lib/db/sqlite.ts";
 import { userTable } from "@lib/db/schema.ts";
 import { eq } from "drizzle-orm";
+import { define } from "../../../utils.ts";
 
-export const handler: Handlers = {
-  async GET(request) {
+export const handler = define.handlers({
+  async GET(ctx) {
     if (!JWT_SECRET) {
       throw new BadRequestError();
     }
 
     // Exchange the authorization code for an access token
-    const cookies = getCookies(request.headers);
+    const cookies = getCookies(ctx.req.headers);
 
     const stored = codeChallengeMap.get(cookies["code_challenge"]);
     if (!stored) {
@@ -26,7 +26,7 @@ export const handler: Handlers = {
 
     const { codeVerifier, redirect } = stored;
 
-    const tokens = await oauth2Client.code.getToken(request.url, {
+    const tokens = await oauth2Client.code.getToken(ctx.req.url, {
       codeVerifier,
     });
 
@@ -53,11 +53,23 @@ export const handler: Handlers = {
       user = res[0];
     }
 
+    if (!JWT_SECRET) {
+      throw new BadRequestError();
+    }
+
+    const key = await crypto.subtle.importKey(
+      "raw",
+      new TextEncoder().encode(JWT_SECRET),
+      { name: "HMAC", hash: "SHA-512" },
+      false,
+      ["sign", "verify"],
+    );
+
     const jwt = await create({ alg: "HS512", type: "JWT" }, {
       id: user.id,
       name: user.name,
       exp: getNumericDate(SESSION_DURATION),
-    }, JWT_SECRET);
+    }, key);
 
     const headers = new Headers({
       location: redirect || "/",
@@ -78,4 +90,4 @@ export const handler: Handlers = {
       status: 302,
     });
   },
-};
+});

routes/api/auth/login.ts

@@ -1,14 +1,15 @@
-import { Handlers } from "$fresh/server.ts";
 import { oauth2Client } from "@lib/auth.ts";
 import { setCookie } from "@std/http/cookie";
+import { define } from "../../../utils.ts";
 
 export const codeChallengeMap = new Map<
   string,
   { codeVerifier: string; redirect?: string }
 >();
 
-export const handler: Handlers = {
-  async GET(req) {
+export const handler = define.handlers({
+  async GET(ctx) {
+    const req = ctx.req;
     const url = new URL(req.url);
 
     const { codeVerifier, uri } = await oauth2Client.code.getAuthorizationUri();
@@ -33,4 +34,4 @@ export const handler: Handlers = {
       status: 302,
     });
   },
-};
+});

routes/api/auth/logout.ts

@@ -1,8 +1,9 @@
 import { deleteCookie } from "@std/http/cookie";
-import { Handlers } from "$fresh/server.ts";
+import { define } from "../../../utils.ts";
 
-export const handler: Handlers = {
-  GET(req) {
+export const handler = define.handlers({
+  GET(ctx) {
+    const req = ctx.req;
     const url = new URL(req.url);
 
     const redirect = decodeURIComponent(url.searchParams.get("redirect") || "");
@@ -19,4 +20,4 @@ export const handler: Handlers = {
       status: 302,
     });
   },
-};
+});

routes/api/cache.ts

@@ -1,10 +1,10 @@
-import { Handlers } from "$fresh/server.ts";
 import { documentTable } from "@lib/db/schema.ts";
 import { db } from "@lib/db/sqlite.ts";
 import { json } from "@lib/helpers.ts";
 import { caches } from "@lib/cache.ts";
+import { define } from "../../utils.ts";
 
-export const handler: Handlers = {
+export const handler = define.handlers({
   async DELETE() {
     for (const cache of caches.values()) {
       cache.clear();
@@ -12,4 +12,4 @@ export const handler: Handlers = {
     await db.delete(documentTable).run();
     return json({ status: "ok" });
   },
-};
+});

routes/api/images/index.ts

@@ -1,6 +1,6 @@
-import { FreshContext, Handlers } from "$fresh/server.ts";
 import { getImageContent } from "@lib/image.ts";
 import { createLogger } from "@lib/log/index.ts";
+import { Context } from "fresh";
 
 const log = createLogger("api/image");
 
@@ -69,9 +69,9 @@ async function generateETag(content: Uint8Array<ArrayBuffer>): Promise<string> {
   }"`;
 }
 
-async function GET(req: Request, _ctx: FreshContext): Promise<Response> {
+async function GET(ctx: Context<unknown>): Promise<Response> {
   try {
-    const url = new URL(req.url);
+    const url = new URL(ctx.req.url);
     const params = parseParams(url);
 
     if (typeof params === "string") {
@@ -106,6 +106,6 @@ async function GET(req: Request, _ctx: FreshContext): Promise<Response> {
   }
 }
 
-export const handler: Handlers = {
+export const handler = {
   GET,
 };

routes/api/index.ts

@@ -1,8 +1,8 @@
-import { Handlers } from "$fresh/server.ts";
 import { json } from "@lib/helpers.ts";
+import { define } from "../../utils.ts";
 
-export const handler: Handlers = {
-  async GET() {
+export const handler = define.handlers({
+  GET() {
     return json([]);
   },
-};
+});

routes/api/logs.ts

@@ -1,9 +1,9 @@
-import { Handlers } from "$fresh/server.ts";
 import { createStreamResponse } from "@lib/helpers.ts";
+import { define } from "../../utils.ts";
 
 const activeResponses: ReturnType<typeof createStreamResponse>[] = [];
 
-export const handler: Handlers = {
+export const handler = define.handlers({
   GET() {
     const r = createStreamResponse();
 
@@ -11,4 +11,4 @@ export const handler: Handlers = {
 
     return r.response;
   },
-};
+});

routes/api/movies/[name].ts

@@ -1,39 +1,40 @@
-import { Handlers } from "$fresh/server.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 {
+  fileExtension,
+  formatDate,
+  isString,
+  safeFileName,
+  toUrlSafeString,
+} from "@lib/string.ts";
+import { AccessDeniedError, BadRequestError } from "@lib/errors.ts";
 import { createResource, fetchResource } from "@lib/marka/index.ts";
 import { ReviewResource } from "@lib/marka/schema.ts";
+import { define } from "../../../utils.ts";
 
-export const handler: Handlers = {
-  async GET(_, ctx) {
+export const handler = define.handlers({
+  async GET(ctx) {
     const movie = await fetchResource(`movies/${ctx.params.name}`);
     return json(movie?.content);
   },
-  async POST(_, ctx) {
+  async POST(ctx) {
     const session = ctx.state.session;
-    if (!session) {
-      throw new AccessDeniedError();
-    }
+    if (!session) throw new AccessDeniedError();
 
     const tmdbId = parseInt(ctx.params.name);
+    if (Number.isNaN(tmdbId)) throw new BadRequestError();
 
-    const movieDetails = await tmdb.getMovie(tmdbId);
-    const movieCredits = await tmdb.getMovieCredits(tmdbId);
+    const [movieDetails, movieCredits] = await Promise.all([
+      tmdb.getMovie(tmdbId),
+      tmdb.getMovieCredits(tmdbId),
+    ]);
 
-    const releaseDate = movieDetails.release_date;
-    const posterPath = movieDetails.poster_path;
-    const director = movieCredits?.crew?.filter?.((person) =>
-      person.job === "Director"
-    )[0];
-
-    movieDetails.overview;
-
-    let finalPath = "";
-    const name = movieDetails.title || movieDetails.original_title ||
+    const name = movieDetails.title ||
+      movieDetails.original_title ||
       ctx.params.name;
+
+    const posterPath = movieDetails.poster_path;
+    let finalPath = "";
     if (posterPath) {
       const poster = await tmdb.getMoviePoster(posterPath);
       const extension = fileExtension(posterPath);
@@ -41,33 +42,32 @@ export const handler: Handlers = {
       await createResource(finalPath, poster);
     }
 
-    const tags: string[] = [];
-    if (movieDetails.genres) {
-      tags.push(
-        ...movieDetails.genres.map((g) => g.name?.toLowerCase()).filter(
-          isString,
-        ),
-      );
-    }
+    const keywords = movieDetails.genres
+      ?.map((g) => g.name?.toLowerCase())
+      .filter(isString) || [];
 
     const movie: ReviewResource["content"] = {
       _type: "Review",
       image: `resources/${finalPath}`,
-      datePublished: releaseDate,
+      datePublished: formatDate(movieDetails.release_date),
       tmdbId,
       author: {
         _type: "Person",
-        name: director?.name,
+        name: movieCredits.crew?.filter?.((person) =>
+          person.job === "Director"
+        )[0]?.name,
       },
       itemReviewed: {
-        name: name,
+        name,
       },
       reviewBody: "",
-      keywords: tags,
+      keywords,
     };
 
-    await createResource(`movies/${safeFileName(name)}.md`, movie);
+    const fileName = toUrlSafeString(name);
 
-    return json(movie);
+    await createResource(`movies/${fileName}.md`, movie);
+
+    return json({ name: fileName });
   },
-};
+});

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

@@ -1,7 +1,11 @@
-import { FreshContext, Handlers } from "$fresh/server.ts";
-import { fileExtension } from "https://deno.land/x/file_extension@v2.1.0/mod.ts";
 import * as tmdb from "@lib/tmdb.ts";
-import { formatDate, isString, safeFileName } from "@lib/string.ts";
+import {
+  fileExtension,
+  formatDate,
+  isString,
+  safeFileName,
+  toUrlSafeString,
+} from "@lib/string.ts";
 import { json } from "@lib/helpers.ts";
 import {
   AccessDeniedError,
@@ -11,82 +15,76 @@ import {
 import { createRecommendationResource } from "@lib/recommendation.ts";
 import { createResource, fetchResource } from "@lib/marka/index.ts";
 import { ReviewResource } from "@lib/marka/schema.ts";
+import { define } from "../../../../utils.ts";
 
-const POST = async (
-  req: Request,
-  ctx: FreshContext,
-): Promise<Response> => {
-  const session = ctx.state.session;
-  if (!session) {
-    throw new AccessDeniedError();
-  }
+export const handler = define.handlers({
+  POST: async function (ctx) {
+    const session = ctx.state.session;
+    if (!session) {
+      throw new AccessDeniedError();
+    }
 
-  const movie = await fetchResource<ReviewResource>(
-    `movies/${ctx.params.name}`,
-  );
-  if (!movie) {
-    throw new NotFoundError();
-  }
+    const movie = await fetchResource<ReviewResource>(
+      `movies/${ctx.params.name}`,
+    );
+    if (!movie) {
+      throw new NotFoundError();
+    }
 
-  const body = await req.json();
-  const name = ctx.params.name;
-  const { tmdbId } = body;
-  if (!name || !tmdbId) {
-    throw new BadRequestError();
-  }
+    const body = await ctx.req.json();
+    const name = ctx.params.name;
+    const { tmdbId } = body;
+    if (!name || !tmdbId) {
+      throw new BadRequestError();
+    }
 
-  const movieDetails = await tmdb.getMovie(tmdbId);
-  const movieCredits = !movie.content?.author &&
-    await tmdb.getMovieCredits(tmdbId);
+    const movieDetails = await tmdb.getMovie(tmdbId);
+    const movieCredits = !movie.content?.author &&
+      await tmdb.getMovieCredits(tmdbId);
 
-  const releaseDate = movieDetails.release_date;
-  if (releaseDate && !movie.content?.datePublished) {
-    movie.content = movie.content || {};
-    movie.content.datePublished = formatDate(new Date(releaseDate));
-  }
-  const director = movieCredits &&
-    movieCredits?.crew?.filter?.((person) => person.job === "Director")[0];
-  if (director && !movie.content?.author) {
-    movie.content = movie.content || {};
-    movie.content.author = {
-      _type: "Person",
-      name: director.name,
+    const director = movieCredits &&
+      movieCredits?.crew?.filter?.((person) => person.job === "Director")[0];
+
+    movie.content ??= {
+      _type: "Review",
     };
-  }
 
-  if (movieDetails.genres) {
-    movie.content.keywords = [
-      ...new Set([
-        ...(movie.content.keywords?.map((g) => g.toLowerCase()) || []),
-        ...movieDetails.genres.map((g) =>
-          g.name?.toLowerCase().replaceAll(" ", "-")
-        ),
-      ].filter(isString)),
-    ];
-  }
+    movie.content.datePublished ??= formatDate(movieDetails.release_date);
 
-  if (!movie.name) {
-    movie.name = tmdbId;
-  }
+    if (director && !movie.content?.author) {
+      movie.content.author = {
+        _type: "Person",
+        name: director.name,
+      };
+    }
 
-  let finalPath = "";
-  const posterPath = movieDetails.poster_path;
-  if (posterPath && !movie.content?.image) {
-    const poster = await tmdb.getMoviePoster(posterPath);
-    const extension = fileExtension(posterPath);
-    finalPath = `movies/images/${safeFileName(name)}_cover.${extension}`;
-    await createResource(finalPath, poster);
-    movie.content = movie.content || {};
-    movie.content.image = finalPath;
-  }
+    if (movieDetails.genres) {
+      movie.content.keywords = [
+        ...new Set([
+          ...(movie.content.keywords?.map((g) => g.toLowerCase()) || []),
+          ...movieDetails.genres.map((g) =>
+            g.name?.toLowerCase().replaceAll(" ", "-")
+          ),
+        ].filter(isString)),
+      ];
+    }
 
-  await createResource(`movies/${safeFileName(movie.name)}.md`, movie);
+    movie.content.tmdbId ??= tmdbId;
 
-  createRecommendationResource(movie, movieDetails.overview);
+    let finalPath = "";
+    const posterPath = movieDetails.poster_path;
+    if (posterPath && !movie.content.image) {
+      const poster = await tmdb.getMoviePoster(posterPath);
+      const extension = fileExtension(posterPath);
+      finalPath = `movies/images/${safeFileName(name)}_cover.${extension}`;
+      await createResource(finalPath, poster);
+      movie.content.image = finalPath;
+    }
 
-  return json(movie);
-};
+    await createResource(`movies/${toUrlSafeString(movie.name)}.md`, movie);
 
-export const handler: Handlers = {
-  POST,
-};
+    createRecommendationResource(movie, movieDetails.overview);
+
+    return json(movie);
+  },
+});

routes/api/movies/index.ts

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

routes/api/query/index.ts

@@ -1,28 +1,23 @@
-import { Handlers } from "$fresh/server.ts";
 import { json } from "@lib/helpers.ts";
-import { AccessDeniedError } from "@lib/errors.ts";
-import { searchResource } from "@lib/search.ts";
+import { AccessDeniedError, BadRequestError } from "@lib/errors.ts";
+import { parseResourceUrl, searchResource } from "@lib/search.ts";
+import { define } from "../../../utils.ts";
 
-export const handler: Handlers = {
-  async GET(req, ctx) {
+export const handler = define.handlers({
+  async GET(ctx) {
+    const req = ctx.req;
     const session = ctx.state.session;
     if (!session) {
       throw new AccessDeniedError();
     }
 
-    const url = new URL(req.url);
+    const s = parseResourceUrl(req.url);
+    if (!s) {
+      throw new BadRequestError();
+    }
 
-    const types = url.searchParams.get("types")?.split(",");
-    const tags = url.searchParams?.get("tags")?.split(",");
-    const authors = url.searchParams?.get("authors")?.split(",");
-
-    const resources = await searchResource({
-      q: url.searchParams.get("q") || "",
-      types,
-      tags,
-      authors,
-    });
+    const resources = await searchResource(s);
 
     return json(resources);
   },
-};
+});