.deepsource.toml

@@ -1,18 +1,16 @@
 version = 1
 
-test_patterns = ["**/*.test.ts"]
-
 [[analyzers]]
 name = "shell"
 
 [[analyzers]]
 name = "javascript"
 
-[analyzers.meta]
-environment = ["nodejs"]
+  [analyzers.meta]
+  environment = ["nodejs"]
 
 [[analyzers]]
 name = "docker"
 
-[analyzers.meta]
-dockerfile_paths = ["Dockerfile"]
+  [analyzers.meta]
+  dockerfile_paths = ["Dockerfile"]

.devcontainer/Dockerfile

@@ -0,0 +1,9 @@
+# Bun doesn't run well on Musl but this seems to work
+FROM oven/bun:1.2.13-alpine as base
+
+# Switch to Bash by editing /etc/passwd
+RUN apk add --no-cache libstdc++ git bash curl openssh cloc && \
+    sed -i -e 's|/bin/ash|/bin/bash|g' /etc/passwd
+
+# Extract Node from its docker image (node:22-alpine)
+COPY --from=node:22-alpine /usr/local/bin/node /usr/local/bin/node

.devcontainer/devcontainer.json

@@ -0,0 +1,34 @@
+{
+    "name": "versia Dev Container",
+    "dockerFile": "Dockerfile",
+    "runArgs": [
+        "-v",
+        "${localWorkspaceFolder}/config:/workspace/config",
+        "-v",
+        "${localWorkspaceFolder}/logs:/workspace/logs",
+        "-v",
+        "${localWorkspaceFolder}/uploads:/workspace/uploads",
+        "--network=host"
+    ],
+    "mounts": [
+        "source=node_modules,target=/workspace/node_modules,type=bind,consistency=cached",
+        "type=bind,source=/home/${localEnv:USER}/.ssh,target=/root/.ssh,readonly"
+    ],
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "terminal.integrated.shell.linux": "/bin/bash"
+            },
+            "extensions": [
+                "biomejs.biome",
+                "ms-vscode-remote.remote-containers",
+                "oven.bun-vscode",
+                "vivaxy.vscode-conventional-commits",
+                "EditorConfig.EditorConfig",
+                "tamasfe.even-better-toml",
+                "YoavBls.pretty-ts-errors",
+                "eamodio.gitlens"
+            ]
+        }
+    }
+}

.github/config.workflow.toml

@@ -429,32 +429,53 @@ text = "No spam"
 
 [logging]
 
-# Available levels: trace, debug, info, warning, error, fatal
-log_level = "info" # For console output
+# Available levels: debug, info, warning, error, fatal
+log_level = "debug"
+
+log_file_path = "logs/versia.log"
+
+[logging.types]
+# Either pass a boolean
+# requests = true
+# Or a table with the following keys:
+# requests_content = { level = "debug", log_file_path = "logs/requests.log" }
+# Available types are: requests, responses, requests_content, filters
 
-# [logging.file]
-# path = "logs/versia.log"
-# log_level = "info"
-#
-# [logging.file.rotation]
-# max_size = 10_000_000 # 10 MB
-# max_files = 10 # Keep 10 rotated files
-#
 # https://sentry.io support
+# Uncomment to enable
 # [logging.sentry]
+# Sentry DSN for error logging
 # dsn = "https://example.com"
 # debug = false
+
 # sample_rate = 1.0
 # traces_sample_rate = 1.0
 # Can also be regex
 # trace_propagation_targets = []
 # max_breadcrumbs = 100
 # environment = "production"
-# log_level = "info"
 
-[authentication]
-# Run Versia Server with this value missing to generate a new key
-key = "ZWcwanRaQAqY3ChUro/Jey9XGQjzsxEed5iqTp4yFr8W6vEnXdz91F/Pu/uf7HBMbNeIK7V6aHsM0lq9onrO8Q=="
+[plugins]
+# Whether to automatically load all plugins in the plugins directory
+autoload = true
+
+# Override for autoload
+[plugins.overrides]
+enabled = []
+disabled = []
+
+[plugins.config."@versia/openid"]
+# If enabled, Versia will require users to log in with an OpenID provider
+forced = false
+
+# Allow registration with OpenID providers
+# If signups.registration is false, it will only be possible to register with OpenID
+allow_registration = true
+
+[plugins.config."@versia/openid".keys]
+# Run Versia Server with those values missing to generate a new key
+public = "MCowBQYDK2VwAyEAfyZx8r98gVHtdH5EF1NYrBeChOXkt50mqiwKO2TX0f8="
+private = "MC4CAQAwBQYDK2VwBCIEILDi1g7+bwNjBBvL4CRWHZpCFBR2m2OPCot62Wr+TCbq"
 
 # The provider MUST support OpenID Connect with .well-known discovery
 # Most notably, GitHub does not support this
@@ -463,7 +484,7 @@ key = "ZWcwanRaQAqY3ChUro/Jey9XGQjzsxEed5iqTp4yFr8W6vEnXdz91F/Pu/uf7HBMbNeIK7V6a
 # The asterisk is important, as it allows for any query parameters to be passed
 # Authentik for example uses regex so it can be set to (regex):
 # <base_url>/oauth/sso/<provider_id>/callback.*
-# [[authentication.openid_providers]]
+# [[plugins.config."@versia/openid".providers]]
 # name = "CPlusPatch ID"
 # id = "cpluspatch-id"
 # This MUST match the provider's issuer URI, including the trailing slash (or lack thereof)

.github/copilot-instructions.md

@@ -13,10 +13,4 @@ const add = (a: number, b: number): number => a + b;
 
 We always write TypeScript with double quotes and four spaces for indentation, so when your responses include TypeScript code, please follow those conventions.
 
-Our codebase uses Drizzle as an ORM, which is exposed in the `@versia-server/kit/db` and `@versia-server/kit/tables` packages. This project uses a monorepo structure with Bun as the package manager.
-
-The app has two modes: worker and API. The worker mode is used for background tasks, while the API mode serves HTTP requests. The entry point for the worker is `worker.ts`, and for the API, it is `api.ts`.
-
-Run the typechecker with `bun run typecheck` to ensure that all TypeScript code is type-checked correctly. Run tests with `bun test` to ensure that all tests pass. Run the linter and formatter with `bun lint` to ensure that the code adheres to our style guidelines, and `bun lint --write` to automatically fix minor/formatting issues.
-
-Cover all new functionality with tests, and ensure that all tests pass before submitting your code.
+Our codebase uses Drizzle as an ORM, with custom abstractions in `classes/database/` for interacting with the database. The `@versia/kit/db` and `@versia/kit/tables` packages are aliases for these abstractions.

.github/workflows/check.yml

@@ -24,4 +24,4 @@ jobs:
 
             - name: Run typechecks
               run: |
-                  bun run typecheck
+                  bun run check

.github/workflows/circular-imports.yml

@@ -1,27 +0,0 @@
-name: Check Circular Imports
-
-on:
-    workflow_call:
-
-jobs:
-    tests:
-        runs-on: ubuntu-latest
-        permissions:
-            contents: read
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Setup Bun
-              uses: oven-sh/setup-bun@v2
-
-            - name: Install NPM packages
-              run: |
-                  bun install
-
-            - name: Run typechecks
-              run: |
-                  bun run detect-circular

.github/workflows/docker.yml

@@ -18,12 +18,9 @@ jobs:
     tests:
         uses: ./.github/workflows/tests.yml
 
-    detect-circular:
-        uses: ./.github/workflows/circular-imports.yml
-
     build:
         if: ${{ success() }}
-        needs: [lint, check, tests, detect-circular]
+        needs: [lint, check, tests]
         runs-on: ubuntu-latest
         permissions:
             contents: read

.github/workflows/docs.yml

@@ -35,12 +35,12 @@ jobs:
               run: bun install
 
             - name: Build with VitePress
-              run: bun run --filter="@versia-server/api" docs:build
+              run: bun run docs:build
 
             - name: Upload artifact
               uses: actions/upload-pages-artifact@v3
               with:
-                  path: packages/api/docs/.vitepress/dist
+                  path: docs/.vitepress/dist
 
     # Deployment job
     deploy:

.github/workflows/publish.yml

@@ -1,48 +0,0 @@
-name: Build & Publish Packages
-
-on:
-    workflow_dispatch:
-        inputs:
-            package:
-                description: "Package to publish"
-                required: true
-                type: choice
-                options:
-                    - client
-                    - sdk
-            tag:
-                description: "NPM tag to use"
-                required: true
-                type: choice
-                default: nightly
-                options:
-                    - latest
-                    - nightly
-
-permissions:
-    contents: read
-    # For provenance generation
-    id-token: write
-
-jobs:
-    publish:
-        runs-on: ubuntu-latest
-        environment: NPM Deploy
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-
-            - uses: oven-sh/setup-bun@v2
-
-            - name: Install
-              run: bun install --frozen-lockfile
-
-            - name: Publish to NPM
-              working-directory: packages/${{ inputs.package }}
-              run: bun publish --provenance --tag ${{ inputs.tag }} --access public
-              env:
-                  NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-            - name: Publish to JSR
-              working-directory: packages/${{ inputs.package }}
-              run: bunx jsr publish --allow-slow-types --allow-dirty

.github/workflows/test-publish.yml

@@ -23,13 +23,16 @@ jobs:
             - uses: oven-sh/setup-bun@v2
 
             - name: Install
-              run: bun install --frozen-lockfile
+              run: bun install
+
+            - name: Configure .npmrc
+              working-directory: packages/${{ matrix.package }}
+              run: |
+                  echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
 
             - name: Publish to NPM
               working-directory: packages/${{ matrix.package }}
-              env:
-                  NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}
-              run: bun publish --dry-run --access public
+              run: bun publish --dry-run
 
             - name: Publish to JSR
               working-directory: packages/${{ matrix.package }}

.madgerc

@@ -1,7 +0,0 @@
-{
-  "detectiveOptions": {
-    "ts": {
-      "skipTypeImports": true
-    }
-  }
-}

.vscode/settings.json

@@ -6,10 +6,9 @@
         "cli",
         "federation",
         "config",
+        "plugin",
         "worker",
-        "media",
-        "packages/client",
-        "packages/sdk"
+        "media"
     ],
     "languageToolLinter.languageTool.ignoredWordsInWorkspace": ["versia"]
 }

CHANGELOG.md

@@ -1,16 +1,3 @@
-# `0.9.0` (upcoming)
-
-## Features
-
-### API
-
--  [x] 🥺 Emoji Reactions are now available! You can react to any note with custom emojis.
--  [x] 🔎 Added support for [batch account data API](https://docs.joinmastodon.org/methods/accounts/#index).
-
-### Backend
-
--   [x] 🚀 Upgraded Bun to `1.3.2`
-
 # `0.8.0` • Federation 2: Electric Boogaloo
 
 ## Backwards Compatibility

CONTRIBUTING.md

@@ -112,7 +112,7 @@ TypeScript errors should be ignored with `// @ts-expect-error` comments, as well
 
 To scan for all TypeScript errors, run:
 ```sh
-bun typecheck
+bun check
 ```
 
 ### Commit messages
@@ -153,4 +153,4 @@ If you find a bug, please open an issue on GitHub. Please make sure to include t
 
 # License
 
-Versia Server is licensed under the [AGPLv3 or later](https://www.gnu.org/licenses/agpl-3.0.en.html) license. By contributing to Versia, you agree to license your contributions under the same license.
+Versia Server is licensed under the [AGPLv3 or later](https://www.gnu.org/licenses/agpl-3.0.en.html) license. By contributing to Versia, you agree to license your contributions under the same license.

Dockerfile

@@ -1,5 +1,7 @@
 # Node is required for building the project
-FROM imbios/bun-node:latest-23-alpine AS base
+FROM imbios/bun-node:1-20-alpine AS base
+
+RUN apk add --no-cache libstdc++
 
 # Install dependencies into temp directory
 # This will cache them and speed up future builds
@@ -20,19 +22,20 @@ COPY --from=install /temp/node_modules /temp/node_modules
 
 # Build the project
 WORKDIR /temp
-RUN bun run build api
+RUN bun run build
 WORKDIR /temp/dist
 
 # Copy production dependencies and source code into final image
-FROM oven/bun:1.3.2-alpine
+FROM oven/bun:1.2.13-alpine
 
 # Install libstdc++ for Bun and create app directory
-RUN mkdir -p /app
+RUN apk add --no-cache libstdc++ && \
+    mkdir -p /app
 
 COPY --from=build /temp/dist /app/dist
 COPY entrypoint.sh /app
 
-LABEL org.opencontainers.image.authors="Gaspard Wierzbinski (https://cpluspatch.com)"
+LABEL org.opencontainers.image.authors="Gaspard Wierzbinski (https://cpluspatch.dev)"
 LABEL org.opencontainers.image.source="https://github.com/versia-pub/server"
 LABEL org.opencontainers.image.vendor="Versia Pub"
 LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
@@ -48,4 +51,4 @@ WORKDIR /app
 ENV NODE_ENV=production
 ENTRYPOINT [ "/bin/sh", "/app/entrypoint.sh" ]
 # Run migrations and start the server
-CMD [ "bun", "run", "api.js" ]
+CMD [ "bun", "run", "index.js" ]

README.md

@@ -95,7 +95,6 @@ The following extensions are currently supported or being worked on:
 - `pub.versia:instance_messaging`: Instance Messaging
 - `pub.versia:likes`: Likes
 - `pub.versia:share`: Share
-- `pub.versia:reactions`: Reactions
 
 ## API
 

Worker.Dockerfile

@@ -1,5 +1,7 @@
 # Node is required for building the project
-FROM imbios/bun-node:latest-23-alpine AS base
+FROM imbios/bun-node:1-20-alpine AS base
+
+RUN apk add --no-cache libstdc++
 
 # Install dependencies into temp directory
 # This will cache them and speed up future builds
@@ -20,19 +22,20 @@ COPY --from=install /temp/node_modules /temp/node_modules
 
 # Build the project
 WORKDIR /temp
-RUN bun run build worker
+RUN bun run build:worker
 WORKDIR /temp/dist
 
 # Copy production dependencies and source code into final image
-FROM oven/bun:1.3.2-alpine
+FROM oven/bun:1.2.13-alpine
 
 # Install libstdc++ for Bun and create app directory
-RUN mkdir -p /app
+RUN apk add --no-cache libstdc++ && \
+    mkdir -p /app
 
 COPY --from=build /temp/dist /app/dist
 COPY entrypoint.sh /app
 
-LABEL org.opencontainers.image.authors="Gaspard Wierzbinski (https://cpluspatch.com)"
+LABEL org.opencontainers.image.authors="Gaspard Wierzbinski (https://cpluspatch.dev)"
 LABEL org.opencontainers.image.source="https://github.com/versia-pub/server"
 LABEL org.opencontainers.image.vendor="Versia Pub"
 LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
@@ -44,8 +47,7 @@ ARG GIT_COMMIT
 ENV GIT_COMMIT=$GIT_COMMIT
 
 # CD to app
-WORKDIR /app
+WORKDIR /app/dist
 ENV NODE_ENV=production
-ENTRYPOINT [ "/bin/sh", "/app/entrypoint.sh" ]
 # Run migrations and start the server
 CMD [ "bun", "run", "worker.js" ]

api.ts

@@ -1,19 +0,0 @@
-import process from "node:process";
-import { appFactory } from "@versia-server/api";
-import { config } from "@versia-server/config";
-import { Youch } from "youch";
-import { createServer } from "@/server.ts";
-
-process.on("SIGINT", () => {
-    process.exit();
-});
-
-process.on("uncaughtException", async (error) => {
-    const youch = new Youch();
-
-    console.error(await youch.toANSI(error));
-});
-
-await import("@versia-server/api/setup");
-
-createServer(config, await appFactory());

api/api/auth/login/index.test.ts

@@ -0,0 +1,229 @@
+import { afterAll, describe, expect, test } from "bun:test";
+import { Application } from "@versia/kit/db";
+import { randomUUIDv7 } from "bun";
+import { randomString } from "@/math";
+import { config } from "~/config.ts";
+import { fakeRequest, getTestUsers } from "~/tests/utils";
+
+const { users, deleteUsers, passwords } = await getTestUsers(1);
+
+// Create application
+const application = await Application.insert({
+    id: randomUUIDv7(),
+    name: "Test Application",
+    clientId: randomString(32, "hex"),
+    secret: "test",
+    redirectUri: "https://example.com",
+    scopes: "read write",
+});
+
+afterAll(async () => {
+    await deleteUsers();
+    await application.delete();
+});
+
+// /api/auth/login
+describe("/api/auth/login", () => {
+    test("should get a JWT with email", async () => {
+        const formData = new FormData();
+
+        formData.append("identifier", users[0]?.data.email ?? "");
+        formData.append("password", passwords[0]);
+
+        const response = await fakeRequest(
+            `/api/auth/login?client_id=${application.data.clientId}&redirect_uri=https://example.com&response_type=code&scope=read+write`,
+            {
+                method: "POST",
+                body: formData,
+            },
+        );
+
+        expect(response.status).toBe(302);
+        expect(response.headers.get("location")).toBeDefined();
+        const locationHeader = new URL(
+            response.headers.get("Location") ?? "",
+            config.http.base_url,
+        );
+
+        expect(locationHeader.pathname).toBe("/oauth/consent");
+        expect(locationHeader.searchParams.get("client_id")).toBe(
+            application.data.clientId,
+        );
+        expect(locationHeader.searchParams.get("redirect_uri")).toBe(
+            "https://example.com",
+        );
+        expect(locationHeader.searchParams.get("response_type")).toBe("code");
+        expect(locationHeader.searchParams.get("scope")).toBe("read write");
+
+        expect(response.headers.get("Set-Cookie")).toMatch(/jwt=[^;]+;/);
+    });
+
+    test("should get a JWT with username", async () => {
+        const formData = new FormData();
+
+        formData.append("identifier", users[0]?.data.username ?? "");
+        formData.append("password", passwords[0]);
+
+        const response = await fakeRequest(
+            `/api/auth/login?client_id=${application.data.clientId}&redirect_uri=https://example.com&response_type=code&scope=read+write`,
+            {
+                method: "POST",
+                body: formData,
+            },
+        );
+
+        expect(response.status).toBe(302);
+        expect(response.headers.get("location")).toBeDefined();
+        const locationHeader = new URL(
+            response.headers.get("Location") ?? "",
+            config.http.base_url,
+        );
+
+        expect(locationHeader.pathname).toBe("/oauth/consent");
+        expect(locationHeader.searchParams.get("client_id")).toBe(
+            application.data.clientId,
+        );
+        expect(locationHeader.searchParams.get("redirect_uri")).toBe(
+            "https://example.com",
+        );
+        expect(locationHeader.searchParams.get("response_type")).toBe("code");
+        expect(locationHeader.searchParams.get("scope")).toBe("read write");
+
+        expect(response.headers.get("Set-Cookie")).toMatch(/jwt=[^;]+;/);
+    });
+
+    test("should have state in the URL", async () => {
+        const formData = new FormData();
+
+        formData.append("identifier", users[0]?.data.email ?? "");
+        formData.append("password", passwords[0]);
+
+        const response = await fakeRequest(
+            `/api/auth/login?client_id=${application.data.clientId}&redirect_uri=https://example.com&response_type=code&scope=read+write&state=abc`,
+            {
+                method: "POST",
+                body: formData,
+            },
+        );
+
+        expect(response.status).toBe(302);
+        expect(response.headers.get("location")).toBeDefined();
+        const locationHeader = new URL(
+            response.headers.get("Location") ?? "",
+            config.http.base_url,
+        );
+
+        expect(locationHeader.pathname).toBe("/oauth/consent");
+        expect(locationHeader.searchParams.get("client_id")).toBe(
+            application.data.clientId,
+        );
+        expect(locationHeader.searchParams.get("redirect_uri")).toBe(
+            "https://example.com",
+        );
+        expect(locationHeader.searchParams.get("response_type")).toBe("code");
+        expect(locationHeader.searchParams.get("scope")).toBe("read write");
+        expect(locationHeader.searchParams.get("state")).toBe("abc");
+
+        expect(response.headers.get("Set-Cookie")).toMatch(/jwt=[^;]+;/);
+    });
+
+    describe("should reject invalid credentials", () => {
+        // Redirects to /oauth/authorize on invalid
+        test("invalid email", async () => {
+            const formData = new FormData();
+
+            formData.append("identifier", "ababa@gmail.com");
+            formData.append("password", "password");
+
+            const response = await fakeRequest(
+                `/api/auth/login?client_id=${application.data.clientId}&redirect_uri=https://example.com&response_type=code&scope=read+write`,
+
+                {
+                    method: "POST",
+                    body: formData,
+                },
+            );
+
+            expect(response.status).toBe(302);
+            expect(response.headers.get("location")).toBeDefined();
+            const locationHeader = new URL(
+                response.headers.get("Location") ?? "",
+                "",
+            );
+
+            expect(locationHeader.pathname).toBe("/oauth/authorize");
+            expect(locationHeader.searchParams.get("error")).toBe(
+                "invalid_grant",
+            );
+            expect(locationHeader.searchParams.get("error_description")).toBe(
+                "Invalid identifier or password",
+            );
+
+            expect(response.headers.get("Set-Cookie")).toBeNull();
+        });
+
+        test("invalid username", async () => {
+            const formData = new FormData();
+
+            formData.append("identifier", "ababa");
+            formData.append("password", "password");
+
+            const response = await fakeRequest(
+                `/api/auth/login?client_id=${application.data.clientId}&redirect_uri=https://example.com&response_type=code&scope=read+write`,
+                {
+                    method: "POST",
+                    body: formData,
+                },
+            );
+
+            expect(response.status).toBe(302);
+            expect(response.headers.get("location")).toBeDefined();
+            const locationHeader = new URL(
+                response.headers.get("Location") ?? "",
+                "",
+            );
+
+            expect(locationHeader.pathname).toBe("/oauth/authorize");
+            expect(locationHeader.searchParams.get("error")).toBe(
+                "invalid_grant",
+            );
+            expect(locationHeader.searchParams.get("error_description")).toBe(
+                "Invalid identifier or password",
+            );
+
+            expect(response.headers.get("Set-Cookie")).toBeNull();
+        });
+
+        test("invalid password", async () => {
+            const formData = new FormData();
+
+            formData.append("identifier", users[0]?.data.email ?? "");
+            formData.append("password", "password");
+
+            const response = await fakeRequest(
+                `/api/auth/login?client_id=${application.data.clientId}&redirect_uri=https://example.com&response_type=code&scope=read+write`,
+                {
+                    method: "POST",
+                    body: formData,
+                },
+            );
+
+            expect(response.status).toBe(302);
+            expect(response.headers.get("location")).toBeDefined();
+            const locationHeader = new URL(
+                response.headers.get("Location") ?? "",
+                "",
+            );
+
+            expect(locationHeader.pathname).toBe("/oauth/authorize");
+            expect(locationHeader.searchParams.get("error")).toBe(
+                "invalid_grant",
+            );
+            expect(locationHeader.searchParams.get("error_description")).toBe(
+                "Invalid identifier or password",
+            );
+
+            expect(response.headers.get("Set-Cookie")).toBeNull();
+        });
+    });
+});

api/api/auth/login/index.ts

@@ -0,0 +1,231 @@
+import { Application, User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
+import { password as bunPassword } from "bun";
+import { eq, or } from "drizzle-orm";
+import type { Context } from "hono";
+import { setCookie } from "hono/cookie";
+import { describeRoute } from "hono-openapi";
+import { validator } from "hono-openapi/zod";
+import { SignJWT } from "jose";
+import { z } from "zod";
+import { apiRoute, handleZodError } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
+import { config } from "~/config.ts";
+
+const returnError = (
+    context: Context,
+    error: string,
+    description: string,
+): Response => {
+    const searchParams = new URLSearchParams();
+
+    // Add all data that is not undefined except email and password
+    for (const [key, value] of Object.entries(context.req.query())) {
+        if (key !== "email" && key !== "password" && value !== undefined) {
+            searchParams.append(key, value);
+        }
+    }
+
+    searchParams.append("error", error);
+    searchParams.append("error_description", description);
+
+    return context.redirect(
+        new URL(
+            `${config.frontend.routes.login}?${searchParams.toString()}`,
+            config.http.base_url,
+        ).toString(),
+    );
+};
+
+export default apiRoute((app) =>
+    app.post(
+        "/api/auth/login",
+        describeRoute({
+            summary: "Login",
+            description: "Login to the application",
+            responses: {
+                302: {
+                    description: "Redirect to OAuth authorize, or error",
+                    headers: {
+                        "Set-Cookie": {
+                            description: "JWT cookie",
+                            required: false,
+                        },
+                    },
+                },
+            },
+        }),
+        validator(
+            "query",
+            z.object({
+                scope: z.string().optional(),
+                redirect_uri: z.string().url().optional(),
+                response_type: z.enum([
+                    "code",
+                    "token",
+                    "none",
+                    "id_token",
+                    "code id_token",
+                    "code token",
+                    "token id_token",
+                    "code token id_token",
+                ]),
+                client_id: z.string(),
+                state: z.string().optional(),
+                code_challenge: z.string().optional(),
+                code_challenge_method: z.enum(["plain", "S256"]).optional(),
+                prompt: z
+                    .enum(["none", "login", "consent", "select_account"])
+                    .optional()
+                    .default("none"),
+                max_age: z
+                    .number()
+                    .int()
+                    .optional()
+                    .default(60 * 60 * 24 * 7),
+            }),
+            handleZodError,
+        ),
+        validator(
+            "form",
+            z.object({
+                identifier: z
+                    .string()
+                    .email()
+                    .toLowerCase()
+                    .or(z.string().toLowerCase()),
+                password: z.string().min(2).max(100),
+            }),
+            handleZodError,
+        ),
+        async (context) => {
+            const oidcConfig = config.plugins?.config?.["@versia/openid"] as
+                | {
+                      forced: boolean;
+                      providers: {
+                          id: string;
+                          name: string;
+                          icon: string;
+                      }[];
+                      keys: {
+                          private: string;
+                          public: string;
+                      };
+                  }
+                | undefined;
+
+            if (!oidcConfig) {
+                return returnError(
+                    context,
+                    "invalid_request",
+                    "The OpenID Connect plugin is not enabled on this instance. Cannot process login request.",
+                );
+            }
+
+            if (oidcConfig?.forced) {
+                return returnError(
+                    context,
+                    "invalid_request",
+                    "Logging in with a password is disabled by the administrator. Please use a valid OpenID Connect provider.",
+                );
+            }
+
+            const { identifier, password } = context.req.valid("form");
+            const { client_id } = context.req.valid("query");
+
+            // Find user
+            const user = await User.fromSql(
+                or(
+                    eq(Users.email, identifier.toLowerCase()),
+                    eq(Users.username, identifier.toLowerCase()),
+                ),
+            );
+
+            if (
+                !(
+                    user &&
+                    (await bunPassword.verify(
+                        password,
+                        user.data.password || "",
+                    ))
+                )
+            ) {
+                return returnError(
+                    context,
+                    "invalid_grant",
+                    "Invalid identifier or password",
+                );
+            }
+
+            if (user.data.passwordResetToken) {
+                return context.redirect(
+                    `${config.frontend.routes.password_reset}?${new URLSearchParams(
+                        {
+                            token: user.data.passwordResetToken ?? "",
+                            login_reset: "true",
+                        },
+                    ).toString()}`,
+                );
+            }
+
+            // Try and import the key
+            const privateKey = await crypto.subtle.importKey(
+                "pkcs8",
+                Buffer.from(oidcConfig?.keys?.private ?? "", "base64"),
+                "Ed25519",
+                false,
+                ["sign"],
+            );
+
+            // Generate JWT
+            const jwt = await new SignJWT({
+                sub: user.id,
+                iss: config.http.base_url.origin,
+                aud: client_id,
+                exp: Math.floor(Date.now() / 1000) + 60 * 60,
+                iat: Math.floor(Date.now() / 1000),
+                nbf: Math.floor(Date.now() / 1000),
+            })
+                .setProtectedHeader({ alg: "EdDSA" })
+                .sign(privateKey);
+
+            const application = await Application.fromClientId(client_id);
+
+            if (!application) {
+                throw new ApiError(400, "Invalid application");
+            }
+
+            const searchParams = new URLSearchParams({
+                application: application.data.name,
+            });
+
+            if (application.data.website) {
+                searchParams.append("website", application.data.website);
+            }
+
+            // Add all data that is not undefined except email and password
+            for (const [key, value] of Object.entries(context.req.query())) {
+                if (
+                    key !== "email" &&
+                    key !== "password" &&
+                    value !== undefined
+                ) {
+                    searchParams.append(key, String(value));
+                }
+            }
+
+            // Redirect to OAuth authorize with JWT
+            setCookie(context, "jwt", jwt, {
+                httpOnly: true,
+                secure: true,
+                sameSite: "Strict",
+                path: "/",
+                // 2 weeks
+                maxAge: 60 * 60 * 24 * 14,
+            });
+            return context.redirect(
+                `${config.frontend.routes.consent}?${searchParams.toString()}`,
+            );
+        },
+    ),
+);

api/api/auth/redirect/index.ts

@@ -0,0 +1,76 @@
+import { db } from "@versia/kit/db";
+import { Applications, Tokens } from "@versia/kit/tables";
+import { and, eq } from "drizzle-orm";
+import { describeRoute } from "hono-openapi";
+import { validator } from "hono-openapi/zod";
+import { z } from "zod";
+import { apiRoute, handleZodError } from "@/api";
+import { config } from "~/config.ts";
+
+/**
+ * OAuth Code flow
+ */
+export default apiRoute((app) =>
+    app.get(
+        "/api/auth/redirect",
+        describeRoute({
+            summary: "OAuth Code flow",
+            description:
+                "Redirects to the application, or back to login if the code is invalid",
+            tags: ["OpenID"],
+            responses: {
+                302: {
+                    description:
+                        "Redirects to the application, or back to login if the code is invalid",
+                },
+            },
+        }),
+        validator(
+            "query",
+            z.object({
+                redirect_uri: z.string().url(),
+                client_id: z.string(),
+                code: z.string(),
+            }),
+            handleZodError,
+        ),
+        async (context) => {
+            const { redirect_uri, client_id, code } =
+                context.req.valid("query");
+
+            const redirectToLogin = (error: string): Response =>
+                context.redirect(
+                    `${config.frontend.routes.login}?${new URLSearchParams({
+                        ...context.req.query,
+                        error: encodeURIComponent(error),
+                    }).toString()}`,
+                );
+
+            const foundToken = await db
+                .select()
+                .from(Tokens)
+                .leftJoin(
+                    Applications,
+                    eq(Tokens.applicationId, Applications.id),
+                )
+                .where(
+                    and(
+                        eq(Tokens.code, code),
+                        eq(Applications.clientId, client_id),
+                    ),
+                )
+                .limit(1);
+
+            if (!foundToken || foundToken.length <= 0) {
+                return redirectToLogin("Invalid code");
+            }
+
+            // Redirect back to application
+            return context.redirect(
+                `${redirect_uri}?${new URLSearchParams({
+                    code,
+                }).toString()}`,
+            );
+        },
+    ),
+);

api/api/auth/reset/index.test.ts

@@ -0,0 +1,124 @@
+import { afterAll, describe, expect, test } from "bun:test";
+import { Application } from "@versia/kit/db";
+import { randomUUIDv7 } from "bun";
+import { randomString } from "@/math";
+import { config } from "~/config.ts";
+import { fakeRequest, getTestUsers } from "~/tests/utils";
+
+const { users, deleteUsers, passwords } = await getTestUsers(1);
+const token = randomString(32, "hex");
+const newPassword = randomString(16, "hex");
+
+// Create application
+const application = await Application.insert({
+    id: randomUUIDv7(),
+    name: "Test Application",
+    clientId: randomString(32, "hex"),
+    secret: "test",
+    redirectUri: "https://example.com",
+    scopes: "read write",
+});
+
+afterAll(async () => {
+    await deleteUsers();
+    await application.delete();
+});
+
+// /api/auth/reset
+describe("/api/auth/reset", () => {
+    test("should login with normal password", async () => {
+        const formData = new FormData();
+
+        formData.append("identifier", users[0]?.data.username ?? "");
+        formData.append("password", passwords[0]);
+
+        const response = await fakeRequest(
+            `/api/auth/login?client_id=${application.data.clientId}&redirect_uri=https://example.com&response_type=code&scope=read+write`,
+
+            {
+                method: "POST",
+                body: formData,
+            },
+        );
+
+        expect(response.status).toBe(302);
+        expect(response.headers.get("location")).toBeDefined();
+    });
+
+    test("should reset password and refuse login with old password", async () => {
+        await users[0]?.update({
+            passwordResetToken: token,
+        });
+
+        const formData = new FormData();
+
+        formData.append("identifier", users[0]?.data.username ?? "");
+        formData.append("password", passwords[0]);
+
+        const response = await fakeRequest(
+            `/api/auth/login?client_id=${application.data.clientId}&redirect_uri=https://example.com&response_type=code&scope=read+write`,
+            {
+                method: "POST",
+                body: formData,
+            },
+        );
+
+        expect(response.status).toBe(302);
+        expect(response.headers.get("location")).toBeDefined();
+        const locationHeader = new URL(
+            response.headers.get("Location") ?? "",
+            config.http.base_url,
+        );
+
+        expect(locationHeader.pathname).toBe("/oauth/reset");
+        expect(locationHeader.searchParams.get("token")).toBe(token);
+    });
+
+    test("should reset password and login with new password", async () => {
+        const formData = new FormData();
+
+        formData.append("token", token);
+        formData.append("password", newPassword);
+        formData.append("password2", newPassword);
+
+        const response = await fakeRequest("/api/auth/reset", {
+            method: "POST",
+            body: formData,
+        });
+
+        expect(response.status).toBe(302);
+        expect(response.headers.get("location")).toBeDefined();
+
+        const loginFormData = new FormData();
+
+        loginFormData.append("identifier", users[0]?.data.username ?? "");
+        loginFormData.append("password", newPassword);
+
+        const loginResponse = await fakeRequest(
+            `/api/auth/login?client_id=${application.data.clientId}&redirect_uri=https://example.com&response_type=code&scope=read+write`,
+            {
+                method: "POST",
+                body: loginFormData,
+            },
+        );
+
+        expect(loginResponse.status).toBe(302);
+        expect(loginResponse.headers.get("location")).toBeDefined();
+        const locationHeader = new URL(
+            loginResponse.headers.get("Location") ?? "",
+            config.http.base_url,
+        );
+
+        expect(locationHeader.pathname).toBe("/oauth/consent");
+        expect(locationHeader.searchParams.get("client_id")).toBe(
+            application.data.clientId,
+        );
+        expect(locationHeader.searchParams.get("redirect_uri")).toBe(
+            "https://example.com",
+        );
+        expect(locationHeader.searchParams.get("response_type")).toBe("code");
+        expect(locationHeader.searchParams.get("scope")).toBe("read write");
+
+        expect(loginResponse.headers.get("Set-Cookie")).toMatch(/jwt=[^;]+;/);
+    });
+});

api/api/auth/reset/index.ts

@@ -0,0 +1,81 @@
+import { User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
+import { password as bunPassword } from "bun";
+import { eq } from "drizzle-orm";
+import type { Context } from "hono";
+import { describeRoute } from "hono-openapi";
+import { validator } from "hono-openapi/zod";
+import { z } from "zod";
+import { apiRoute, handleZodError } from "@/api";
+import { config } from "~/config.ts";
+
+const returnError = (
+    context: Context,
+    token: string,
+    error: string,
+    description: string,
+): Response => {
+    const searchParams = new URLSearchParams();
+
+    searchParams.append("error", error);
+    searchParams.append("error_description", description);
+    searchParams.append("token", token);
+
+    return context.redirect(
+        new URL(
+            `${
+                config.frontend.routes.password_reset
+            }?${searchParams.toString()}`,
+            config.http.base_url,
+        ).toString(),
+    );
+};
+
+export default apiRoute((app) =>
+    app.post(
+        "/api/auth/reset",
+        describeRoute({
+            summary: "Reset password",
+            description: "Reset password",
+            responses: {
+                302: {
+                    description:
+                        "Redirect to the password reset page with a message",
+                },
+            },
+        }),
+        validator(
+            "form",
+            z.object({
+                token: z.string().min(1),
+                password: z.string().min(3).max(100),
+            }),
+            handleZodError,
+        ),
+        async (context) => {
+            const { token, password } = context.req.valid("form");
+
+            const user = await User.fromSql(
+                eq(Users.passwordResetToken, token),
+            );
+
+            if (!user) {
+                return returnError(
+                    context,
+                    token,
+                    "invalid_token",
+                    "Invalid token",
+                );
+            }
+
+            await user.update({
+                password: await bunPassword.hash(password),
+                passwordResetToken: null,
+            });
+
+            return context.redirect(
+                `${config.frontend.routes.password_reset}?success=true`,
+            );
+        },
+    ),
+);

api/api/v1/accounts/[id]/block.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

api/api/v1/accounts/[id]/block.ts

@@ -2,10 +2,11 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, withUserParam } from "@versia-server/kit/api";
-import { Relationship } from "@versia-server/kit/db";
-import { describeRoute, resolver } from "hono-openapi";
+import { Relationship } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.post(

api/api/v1/accounts/[id]/feed.atom.ts

@@ -1,14 +1,10 @@
 import { RolePermission } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    withUserParam,
-} from "@versia-server/kit/api";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
 import { getFeed } from "@/rss";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(
@@ -38,13 +34,12 @@ export default apiRoute((app) =>
                 RolePermission.ViewNotes,
                 RolePermission.ViewAccounts,
             ],
-
             scopes: ["read:statuses"],
         }),
         validator(
             "query",
             z.object({
-                page: z.coerce.number().default(0).meta({
+                page: z.coerce.number().default(0).openapi({
                     description: "Page number to fetch. Defaults to 0.",
                     example: 2,
                 }),

api/api/v1/accounts/[id]/feed.rss.ts

@@ -1,14 +1,10 @@
 import { RolePermission } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    withUserParam,
-} from "@versia-server/kit/api";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
 import { getFeed } from "@/rss";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(
@@ -37,13 +33,12 @@ export default apiRoute((app) =>
                 RolePermission.ViewNotes,
                 RolePermission.ViewAccounts,
             ],
-
             scopes: ["read:statuses"],
         }),
         validator(
             "query",
             z.object({
-                page: z.coerce.number().default(0).meta({
+                page: z.coerce.number().default(0).openapi({
                     description: "Page number to fetch. Defaults to 0.",
                     example: 2,
                 }),

api/api/v1/accounts/[id]/follow.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(3);
 

api/api/v1/accounts/[id]/follow.ts

@@ -3,16 +3,12 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    withUserParam,
-} from "@versia-server/kit/api";
-import { Relationship } from "@versia-server/kit/db";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { Relationship } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.post(
@@ -61,12 +57,12 @@ export default apiRoute((app) =>
         validator(
             "json",
             z.object({
-                reblogs: z.boolean().default(true).meta({
+                reblogs: z.boolean().default(true).openapi({
                     description:
                         "Receive this account’s reblogs in home timeline?",
                     example: true,
                 }),
-                notify: z.boolean().default(false).meta({
+                notify: z.boolean().default(false).openapi({
                     description:
                         "Receive notifications when this account posts a status?",
                     example: false,
@@ -74,7 +70,7 @@ export default apiRoute((app) =>
                 languages: z
                     .array(iso631)
                     .default([])
-                    .meta({
+                    .openapi({
                         description:
                             "Array of String (ISO 639-1 language two-letter code). Filter received statuses for these languages. If not provided, you will receive this account’s posts in all languages.",
                         example: ["en", "fr"],

api/api/v1/accounts/[id]/followers.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

api/api/v1/accounts/[id]/followers.ts

@@ -2,18 +2,14 @@ import {
     Account as AccountSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    withUserParam,
-} from "@versia-server/kit/api";
-import { Timeline } from "@versia-server/kit/db";
-import { Users } from "@versia-server/kit/tables";
+import { Timeline } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(
@@ -38,7 +34,7 @@ export default apiRoute((app) =>
                         link: z
                             .string()
                             .optional()
-                            .meta({
+                            .openapi({
                                 description:
                                     "Links to the next and previous pages",
                                 example:
@@ -65,22 +61,22 @@ export default apiRoute((app) =>
         validator(
             "query",
             z.object({
-                max_id: AccountSchema.shape.id.optional().meta({
+                max_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be lesser than this ID. In effect, sets an upper bound on results.",
                     example: "8d35243d-b959-43e2-8bac-1a9d4eaea2aa",
                 }),
-                since_id: AccountSchema.shape.id.optional().meta({
+                since_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be greater than this ID. In effect, sets a lower bound on results.",
                     example: undefined,
                 }),
-                min_id: AccountSchema.shape.id.optional().meta({
+                min_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "Returns results immediately newer than this ID. In effect, sets a cursor at this ID and paginates forward.",
                     example: undefined,
                 }),
-                limit: z.number().int().min(1).max(40).default(20).meta({
+                limit: z.number().int().min(1).max(40).default(20).openapi({
                     description: "Maximum number of results to return.",
                 }),
             }),

api/api/v1/accounts/[id]/following.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

api/api/v1/accounts/[id]/following.ts

@@ -2,18 +2,14 @@ import {
     Account as AccountSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    withUserParam,
-} from "@versia-server/kit/api";
-import { Timeline } from "@versia-server/kit/db";
-import { Users } from "@versia-server/kit/tables";
+import { Timeline } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(
@@ -39,7 +35,7 @@ export default apiRoute((app) =>
                         link: z
                             .string()
                             .optional()
-                            .meta({
+                            .openapi({
                                 description:
                                     "Links to the next and previous pages",
                                 example:
@@ -66,22 +62,22 @@ export default apiRoute((app) =>
         validator(
             "query",
             z.object({
-                max_id: AccountSchema.shape.id.optional().meta({
+                max_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be lesser than this ID. In effect, sets an upper bound on results.",
                     example: "8d35243d-b959-43e2-8bac-1a9d4eaea2aa",
                 }),
-                since_id: AccountSchema.shape.id.optional().meta({
+                since_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be greater than this ID. In effect, sets a lower bound on results.",
                     example: undefined,
                 }),
-                min_id: AccountSchema.shape.id.optional().meta({
+                min_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "Returns results immediately newer than this ID. In effect, sets a cursor at this ID and paginates forward.",
                     example: undefined,
                 }),
-                limit: z.number().int().min(1).max(40).default(20).meta({
+                limit: z.number().int().min(1).max(40).default(20).openapi({
                     description: "Maximum number of results to return.",
                 }),
             }),

api/api/v1/accounts/[id]/index.test.ts

@@ -1,9 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import {
-    generateClient,
-    getTestStatuses,
-    getTestUsers,
-} from "@versia-server/tests";
+import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(5, users[0])).toReversed();

api/api/v1/accounts/[id]/index.ts

@@ -2,9 +2,10 @@ import {
     Account as AccountSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, withUserParam } from "@versia-server/kit/api";
-import { describeRoute, resolver } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(

api/api/v1/accounts/[id]/mute.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

api/api/v1/accounts/[id]/mute.ts

@@ -2,20 +2,16 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    withUserParam,
-} from "@versia-server/kit/api";
-import { Relationship } from "@versia-server/kit/db";
+import { Relationship } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
+import { z } from "zod";
+import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 import {
     RelationshipJobType,
     relationshipQueue,
-} from "@versia-server/kit/queues/relationships";
-import { describeRoute, resolver, validator } from "hono-openapi";
-import { z } from "zod";
+} from "~/classes/queues/relationships";
 
 export default apiRoute((app) =>
     app.post(
@@ -55,7 +51,7 @@ export default apiRoute((app) =>
         validator(
             "json",
             z.object({
-                notifications: z.boolean().default(true).meta({
+                notifications: z.boolean().default(true).openapi({
                     description: "Mute notifications in addition to statuses?",
                 }),
                 duration: z
@@ -64,7 +60,7 @@ export default apiRoute((app) =>
                     .min(0)
                     .max(60 * 60 * 24 * 365 * 5)
                     .default(0)
-                    .meta({
+                    .openapi({
                         description:
                             "How long the mute should last, in seconds. 0 means indefinite.",
                     }),

api/api/v1/accounts/[id]/note.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

api/api/v1/accounts/[id]/note.ts

@@ -2,16 +2,12 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    withUserParam,
-} from "@versia-server/kit/api";
-import { Relationship } from "@versia-server/kit/db";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { Relationship } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.post(
@@ -49,7 +45,7 @@ export default apiRoute((app) =>
         validator(
             "json",
             z.object({
-                comment: RelationshipSchema.shape.note.optional().meta({
+                comment: RelationshipSchema.shape.note.optional().openapi({
                     description:
                         "The comment to be set on that user. Provide an empty string or leave out this parameter to clear the currently set note.",
                 }),

api/api/v1/accounts/[id]/pin.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

api/api/v1/accounts/[id]/pin.ts

@@ -2,9 +2,10 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { apiRoute, auth, withUserParam } from "@versia-server/kit/api";
-import { Relationship } from "@versia-server/kit/db";
-import { describeRoute, resolver } from "hono-openapi";
+import { Relationship } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) =>
     app.post(

api/api/v1/accounts/[id]/refetch.ts

@@ -2,10 +2,11 @@ import {
     Account as AccountSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, withUserParam } from "@versia-server/kit/api";
-import { User } from "@versia-server/kit/db";
-import { describeRoute, resolver } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth, withUserParam } from "@/api";
+import { User } from "~/classes/database/user";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.post(

api/api/v1/accounts/[id]/remove_from_followers.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

api/api/v1/accounts/[id]/remove_from_followers.ts

@@ -2,10 +2,11 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, withUserParam } from "@versia-server/kit/api";
-import { Relationship } from "@versia-server/kit/db";
-import { describeRoute, resolver } from "hono-openapi";
+import { Relationship } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.post(

api/api/v1/accounts/[id]/roles/[role_id]/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { RolePermission } from "@versia/client/schemas";
-import { Role } from "@versia-server/kit/db";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { Role } from "@versia/kit/db";
 import { randomUUIDv7 } from "bun";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 let role: Role;

api/api/v1/accounts/[id]/roles/[role_id]/index.ts

@@ -3,16 +3,12 @@ import {
     RolePermission,
     Role as RoleSchema,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    withUserParam,
-} from "@versia-server/kit/api";
-import { Role } from "@versia-server/kit/db";
-import { describeRoute, validator } from "hono-openapi";
+import { Role } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) => {
     app.post(

api/api/v1/accounts/[id]/roles/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { RolePermission } from "@versia/client/schemas";
-import { Role } from "@versia-server/kit/db";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { Role } from "@versia/kit/db";
 import { randomUUIDv7 } from "bun";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 let role: Role;

api/api/v1/accounts/[id]/roles/index.ts

@@ -1,8 +1,9 @@
 import { Role as RoleSchema } from "@versia/client/schemas";
-import { apiRoute, auth, withUserParam } from "@versia-server/kit/api";
-import { Role } from "@versia-server/kit/db";
-import { describeRoute, resolver } from "hono-openapi";
+import { Role } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, withUserParam } from "@/api";
 
 export default apiRoute((app) => {
     app.get(

api/api/v1/accounts/[id]/statuses.test.ts

@@ -3,7 +3,7 @@ import {
     generateClient,
     getTestStatuses,
     getTestUsers,
-} from "@versia-server/tests";
+} from "~/tests/utils.ts";
 
 const { users, deleteUsers } = await getTestUsers(5);
 const timeline = (await getTestStatuses(5, users[1])).toReversed();

api/api/v1/accounts/[id]/statuses.ts

@@ -3,18 +3,14 @@ import {
     Status as StatusSchema,
     zBoolean,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    withUserParam,
-} from "@versia-server/kit/api";
-import { Timeline } from "@versia-server/kit/db";
-import { Notes } from "@versia-server/kit/tables";
+import { Timeline } from "@versia/kit/db";
+import { Notes } from "@versia/kit/tables";
 import { and, eq, gt, gte, inArray, isNull, lt, or, sql } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(
@@ -46,45 +42,50 @@ export default apiRoute((app) =>
                 RolePermission.ViewNotes,
                 RolePermission.ViewAccounts,
             ],
-
             scopes: ["read:statuses"],
         }),
         validator(
             "query",
             z.object({
-                max_id: StatusSchema.shape.id.optional().meta({
+                max_id: StatusSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be lesser than this ID. In effect, sets an upper bound on results.",
                     example: "8d35243d-b959-43e2-8bac-1a9d4eaea2aa",
                 }),
-                since_id: StatusSchema.shape.id.optional().meta({
+                since_id: StatusSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be greater than this ID. In effect, sets a lower bound on results.",
                     example: undefined,
                 }),
-                min_id: StatusSchema.shape.id.optional().meta({
+                min_id: StatusSchema.shape.id.optional().openapi({
                     description:
                         "Returns results immediately newer than this ID. In effect, sets a cursor at this ID and paginates forward.",
                     example: undefined,
                 }),
-                limit: z.coerce.number().int().min(1).max(40).default(20).meta({
-                    description: "Maximum number of results to return.",
-                }),
-                only_media: zBoolean.default(false).meta({
+                limit: z.coerce
+                    .number()
+                    .int()
+                    .min(1)
+                    .max(40)
+                    .default(20)
+                    .openapi({
+                        description: "Maximum number of results to return.",
+                    }),
+                only_media: zBoolean.default(false).openapi({
                     description: "Filter out statuses without attachments.",
                 }),
-                exclude_replies: zBoolean.default(false).meta({
+                exclude_replies: zBoolean.default(false).openapi({
                     description:
                         "Filter out statuses in reply to a different account.",
                 }),
-                exclude_reblogs: zBoolean.default(false).meta({
+                exclude_reblogs: zBoolean.default(false).openapi({
                     description: "Filter out boosts from the response.",
                 }),
-                pinned: zBoolean.default(false).meta({
+                pinned: zBoolean.default(false).openapi({
                     description:
                         "Filter for pinned statuses only. Pinned statuses do not receive special priority in the order of the returned results.",
                 }),
-                tagged: z.string().optional().meta({
+                tagged: z.string().optional().openapi({
                     description:
                         "Filter for statuses using a specific hashtag.",
                 }),

api/api/v1/accounts/[id]/unblock.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

api/api/v1/accounts/[id]/unblock.ts

@@ -2,10 +2,11 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, withUserParam } from "@versia-server/kit/api";
-import { Relationship } from "@versia-server/kit/db";
-import { describeRoute, resolver } from "hono-openapi";
+import { Relationship } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.post(

api/api/v1/accounts/[id]/unfollow.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(3);
 

api/api/v1/accounts/[id]/unfollow.ts

@@ -2,10 +2,11 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, withUserParam } from "@versia-server/kit/api";
-import { Relationship } from "@versia-server/kit/db";
-import { describeRoute, resolver } from "hono-openapi";
+import { Relationship } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.post(

api/api/v1/accounts/[id]/unmute.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

api/api/v1/accounts/[id]/unmute.ts

@@ -2,10 +2,11 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, withUserParam } from "@versia-server/kit/api";
-import { Relationship } from "@versia-server/kit/db";
-import { describeRoute, resolver } from "hono-openapi";
+import { Relationship } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.post(

api/api/v1/accounts/[id]/unpin.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

api/api/v1/accounts/[id]/unpin.ts

@@ -2,10 +2,11 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, withUserParam } from "@versia-server/kit/api";
-import { Relationship } from "@versia-server/kit/db";
-import { describeRoute, resolver } from "hono-openapi";
+import { Relationship } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth, withUserParam } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.post(

api/api/v1/accounts/familiar_followers/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils.ts";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

api/api/v1/accounts/familiar_followers/index.ts

@@ -3,19 +3,15 @@ import {
     FamiliarFollowers as FamiliarFollowersSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    qsQuery,
-} from "@versia-server/kit/api";
-import { db, User } from "@versia-server/kit/db";
-import type { Users } from "@versia-server/kit/tables";
+import { db, User } from "@versia/kit/db";
+import type { Users } from "@versia/kit/tables";
 import { type InferSelectModel, sql } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { rateLimit } from "../../../../../middlewares/rate-limit.ts";
+import { apiRoute, auth, handleZodError, qsQuery } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
+import { rateLimit } from "~/middlewares/rate-limit";
 
 export default apiRoute((app) =>
     app.get(
@@ -55,8 +51,8 @@ export default apiRoute((app) =>
                     .array(AccountSchema.shape.id)
                     .min(1)
                     .max(10)
-                    .or(AccountSchema.shape.id)
-                    .meta({
+                    .or(AccountSchema.shape.id.transform((v) => [v]))
+                    .openapi({
                         description:
                             "Find familiar followers for the provided account IDs.",
                         example: [
@@ -69,11 +65,11 @@ export default apiRoute((app) =>
         ),
         async (context) => {
             const { user } = context.get("auth");
-            const { id } = context.req.valid("query");
+            const { id: ids } = context.req.valid("query");
 
             // Find followers of the accounts in "ids", that you also follow
             const finalUsers = await Promise.all(
-                (Array.isArray(id) ? id : [id]).map(async (id) => ({
+                ids.map(async (id) => ({
                     id,
                     accounts: await User.fromIds(
                         (

api/api/v1/accounts/index.test.ts

@@ -1,9 +1,9 @@
 import { afterEach, describe, expect, test } from "bun:test";
-import { db } from "@versia-server/kit/db";
-import { Users } from "@versia-server/kit/tables";
-import { generateClient, getSolvedChallenge } from "@versia-server/tests";
+import { db } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { eq } from "drizzle-orm";
 import { randomString } from "@/math";
+import { generateClient, getSolvedChallenge } from "~/tests/utils";
 
 const username = randomString(10, "hex");
 const username2 = randomString(10, "hex");

api/api/v1/accounts/index.ts

@@ -1,114 +1,48 @@
-import { Account as AccountSchema, zBoolean } from "@versia/client/schemas";
-import { config } from "@versia-server/config";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    jsonOrForm,
-    qsQuery,
-} from "@versia-server/kit/api";
-import { User } from "@versia-server/kit/db";
-import { searchManager } from "@versia-server/kit/search";
-import { Users } from "@versia-server/kit/tables";
+import { zBoolean } from "@versia/client/schemas";
+import { User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, eq, isNull } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import ISO6391 from "iso-639-1";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError, jsonOrForm } from "@/api";
 import { tempmailDomains } from "@/tempmail";
-import { rateLimit } from "../../../../middlewares/rate-limit.ts";
+import { ApiError } from "~/classes/errors/api-error";
+import { config } from "~/config.ts";
+import { rateLimit } from "~/middlewares/rate-limit";
 
 const schema = z.object({
-    username: z.string().meta({
+    username: z.string().openapi({
         description: "The desired username for the account",
         example: "alice",
     }),
-    email: z.string().toLowerCase().meta({
+    email: z.string().toLowerCase().openapi({
         description:
             "The email address to be used for login. Transformed to lowercase.",
         example: "alice@gmail.com",
     }),
-    password: z.string().meta({
+    password: z.string().openapi({
         description: "The password to be used for login",
         example: "hunter2",
     }),
-    agreement: zBoolean.meta({
+    agreement: zBoolean.openapi({
         description:
             "Whether the user agrees to the local rules, terms, and policies. These should be presented to the user in order to allow them to consent before setting this parameter to TRUE.",
         example: true,
     }),
-    locale: z.string().meta({
+    locale: z.string().openapi({
         description:
             "The language of the confirmation email that will be sent. ISO 639-1 code.",
         example: "en",
     }),
-    reason: z.string().optional().meta({
+    reason: z.string().optional().openapi({
         description:
             "If registrations require manual approval, this text will be reviewed by moderators.",
     }),
 });
 
-export default apiRoute((app) => {
-    app.get(
-        "/api/v1/accounts",
-        describeRoute({
-            summary: "Get multiple accounts",
-            description: "View information about multiple profiles.",
-            externalDocs: {
-                url: "https://docs.joinmastodon.org/methods/accounts/#index",
-            },
-            tags: ["Accounts"],
-            responses: {
-                200: {
-                    description:
-                        "Account records for the requested confirmed and approved accounts. There can be fewer records than requested if the accounts do not exist or are not confirmed.",
-                    content: {
-                        "application/json": {
-                            schema: resolver(z.array(AccountSchema)),
-                        },
-                    },
-                },
-                422: ApiError.validationFailed().schema,
-            },
-        }),
-        qsQuery(),
-        auth({
-            auth: false,
-            scopes: [],
-            challenge: false,
-        }),
-        rateLimit(40),
-        validator(
-            "query",
-            z.object({
-                id: z
-                    .array(AccountSchema.shape.id)
-                    .min(1)
-                    .max(40)
-                    .or(AccountSchema.shape.id)
-                    .meta({
-                        description: "The IDs of the Accounts in the database.",
-                        example: [
-                            "f137ce6f-ff5e-4998-b20f-0361ba9be007",
-                            "8424c654-5d03-4a1b-bec8-4e87db811b5d",
-                        ],
-                    }),
-            }),
-            handleZodError,
-        ),
-        async (context) => {
-            const { id } = context.req.valid("query");
-
-            // Find accounts by IDs
-            const accounts = await User.fromIds(Array.isArray(id) ? id : [id]);
-
-            return context.json(
-                accounts.map((account) => account.toApi()),
-                200,
-            );
-        },
-    );
-
+export default apiRoute((app) =>
     app.post(
         "/api/v1/accounts",
         describeRoute({
@@ -419,15 +353,12 @@ export default apiRoute((app) => {
                 );
             }
 
-            const user = await User.register(username, {
+            await User.register(username, {
                 password,
                 email,
             });
 
-            // Add to search index
-            await searchManager.addUser(user);
-
             return context.text("", 200);
         },
-    );
-});
+    ),
+);

api/api/v1/accounts/lookup/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

api/api/v1/accounts/lookup/index.ts

@@ -2,16 +2,16 @@ import {
     Account as AccountSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { config } from "@versia-server/config";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, handleZodError } from "@versia-server/kit/api";
-import { Instance, User } from "@versia-server/kit/db";
-import { parseUserAddress } from "@versia-server/kit/parsers";
-import { Users } from "@versia-server/kit/tables";
+import { Instance, User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, eq, isNull } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { rateLimit } from "../../../../../middlewares/rate-limit.ts";
+import { apiRoute, auth, handleZodError, parseUserAddress } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
+import { config } from "~/config.ts";
+import { rateLimit } from "~/middlewares/rate-limit";
 
 export default apiRoute((app) =>
     app.get(
@@ -42,7 +42,7 @@ export default apiRoute((app) =>
         validator(
             "query",
             z.object({
-                acct: AccountSchema.shape.acct.meta({
+                acct: AccountSchema.shape.acct.openapi({
                     description: "The username or Webfinger address to lookup.",
                     example: "lexi@beta.versia.social",
                 }),

api/api/v1/accounts/relationships/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { db } from "@versia-server/kit/db";
-import { Users } from "@versia-server/kit/tables";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { db } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { eq } from "drizzle-orm";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

api/api/v1/accounts/relationships/index.ts

@@ -4,17 +4,13 @@ import {
     RolePermission,
     zBoolean,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    qsQuery,
-} from "@versia-server/kit/api";
-import { Relationship } from "@versia-server/kit/db";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { Relationship } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
-import { rateLimit } from "../../../../../middlewares/rate-limit.ts";
+import { apiRoute, auth, handleZodError, qsQuery } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
+import { rateLimit } from "~/middlewares/rate-limit";
 
 export default apiRoute((app) =>
     app.get(
@@ -54,8 +50,8 @@ export default apiRoute((app) =>
                     .array(AccountSchema.shape.id)
                     .min(1)
                     .max(10)
-                    .or(AccountSchema.shape.id)
-                    .meta({
+                    .or(AccountSchema.shape.id.transform((v) => [v]))
+                    .openapi({
                         description:
                             "Check relationships for the provided account IDs.",
                         example: [
@@ -63,7 +59,7 @@ export default apiRoute((app) =>
                             "8424c654-5d03-4a1b-bec8-4e87db811b5d",
                         ],
                     }),
-                with_suspended: zBoolean.default(false).meta({
+                with_suspended: zBoolean.default(false).openapi({
                     description:
                         "Whether relationships should be returned for suspended users",
                     example: false,
@@ -77,14 +73,17 @@ export default apiRoute((app) =>
             // TODO: Implement with_suspended
             const { id } = context.req.valid("query");
 
+            const ids = Array.isArray(id) ? id : [id];
+
             const relationships = await Relationship.fromOwnerAndSubjects(
                 user,
-                Array.isArray(id) ? id : [id],
+                ids,
             );
 
             relationships.sort(
                 (a, b) =>
-                    id.indexOf(a.data.subjectId) - id.indexOf(b.data.subjectId),
+                    ids.indexOf(a.data.subjectId) -
+                    ids.indexOf(b.data.subjectId),
             );
 
             return context.json(

api/api/v1/accounts/search/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(5);
 

api/api/v1/accounts/search/index.ts

@@ -3,16 +3,16 @@ import {
     RolePermission,
     zBoolean,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, handleZodError } from "@versia-server/kit/api";
-import { User } from "@versia-server/kit/db";
-import { parseUserAddress } from "@versia-server/kit/parsers";
-import { Users } from "@versia-server/kit/tables";
+import { User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { eq, ilike, not, or, sql } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import stringComparison from "string-comparison";
 import { z } from "zod";
-import { rateLimit } from "../../../../../middlewares/rate-limit.ts";
+import { apiRoute, auth, handleZodError, parseUserAddress } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
+import { rateLimit } from "~/middlewares/rate-limit";
 
 export default apiRoute((app) =>
     app.get(
@@ -47,24 +47,30 @@ export default apiRoute((app) =>
             z.object({
                 q: AccountSchema.shape.username
                     .or(AccountSchema.shape.acct)
-                    .meta({
+                    .openapi({
                         description: "Search query for accounts.",
                         example: "username",
                     }),
-                limit: z.coerce.number().int().min(1).max(80).default(40).meta({
-                    description: "Maximum number of results.",
-                    example: 40,
-                }),
-                offset: z.coerce.number().int().default(0).meta({
+                limit: z.coerce
+                    .number()
+                    .int()
+                    .min(1)
+                    .max(80)
+                    .default(40)
+                    .openapi({
+                        description: "Maximum number of results.",
+                        example: 40,
+                    }),
+                offset: z.coerce.number().int().default(0).openapi({
                     description: "Skip the first n results.",
                     example: 0,
                 }),
-                resolve: zBoolean.default(false).meta({
+                resolve: zBoolean.default(false).openapi({
                     description:
                         "Attempt WebFinger lookup. Use this when q is an exact address.",
                     example: false,
                 }),
-                following: zBoolean.default(false).meta({
+                following: zBoolean.default(false).openapi({
                     description: "Limit the search to users you are following.",
                     example: false,
                 }),

api/api/v1/accounts/update_credentials/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { config } from "@versia-server/config";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { config } from "~/config.ts";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(1);
 

api/api/v1/accounts/update_credentials/index.ts

@@ -3,24 +3,20 @@ import {
     RolePermission,
     zBoolean,
 } from "@versia/client/schemas";
-import * as VersiaEntities from "@versia/sdk/entities";
-import { config } from "@versia-server/config";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    jsonOrForm,
-} from "@versia-server/kit/api";
-import { Emoji, Media, User } from "@versia-server/kit/db";
-import { versiaTextToHtml } from "@versia-server/kit/parsers";
-import { Users } from "@versia-server/kit/tables";
+import { Emoji, Media, User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, eq, isNull } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError, jsonOrForm } from "@/api";
 import { mergeAndDeduplicate } from "@/lib";
 import { sanitizedHtmlStrip } from "@/sanitization";
-import { rateLimit } from "../../../../../middlewares/rate-limit.ts";
+import { ApiError } from "~/classes/errors/api-error";
+import { contentToHtml } from "~/classes/functions/status";
+import { config } from "~/config.ts";
+import { rateLimit } from "~/middlewares/rate-limit";
+import * as VersiaEntities from "~/packages/sdk/entities";
 
 export default apiRoute((app) =>
     app.patch(
@@ -57,7 +53,7 @@ export default apiRoute((app) =>
             z
                 .object({
                     display_name: AccountSchema.shape.display_name
-                        .meta({
+                        .openapi({
                             description:
                                 "The display name to use for the profile.",
                             example: "Lexi",
@@ -74,7 +70,7 @@ export default apiRoute((app) =>
                             "Display name contains blocked words",
                         ),
                     username: AccountSchema.shape.username
-                        .meta({
+                        .openapi({
                             description: "The username to use for the profile.",
                             example: "lexi",
                         })
@@ -94,7 +90,7 @@ export default apiRoute((app) =>
                             "Username is disallowed",
                         ),
                     note: AccountSchema.shape.note
-                        .meta({
+                        .openapi({
                             description:
                                 "The account bio. Markdown is supported.",
                         })
@@ -107,60 +103,72 @@ export default apiRoute((app) =>
                             "Bio contains blocked words",
                         ),
                     avatar: z
+                        .string()
                         .url()
-                        .meta({
+                        .transform((a) => new URL(a))
+                        .openapi({
                             description: "Avatar image URL",
                         })
                         .or(
                             z
-                                .file()
-                                .max(
-                                    config.validation.accounts.max_avatar_bytes,
+                                .instanceof(File)
+                                .refine(
+                                    (v) =>
+                                        v.size <=
+                                        config.validation.accounts
+                                            .max_avatar_bytes,
+                                    `Avatar must be less than ${config.validation.accounts.max_avatar_bytes} bytes`,
                                 )
-                                .meta({
+                                .openapi({
                                     description:
                                         "Avatar image encoded using multipart/form-data",
                                 }),
                         ),
                     header: z
+                        .string()
                         .url()
-                        .meta({
+                        .transform((v) => new URL(v))
+                        .openapi({
                             description: "Header image URL",
                         })
                         .or(
                             z
-                                .file()
-                                .max(
-                                    config.validation.accounts.max_header_bytes,
+                                .instanceof(File)
+                                .refine(
+                                    (v) =>
+                                        v.size <=
+                                        config.validation.accounts
+                                            .max_header_bytes,
+                                    `Header must be less than ${config.validation.accounts.max_header_bytes} bytes`,
                                 )
-                                .meta({
+                                .openapi({
                                     description:
                                         "Header image encoded using multipart/form-data",
                                 }),
                         ),
-                    locked: AccountSchema.shape.locked.meta({
+                    locked: AccountSchema.shape.locked.openapi({
                         description:
                             "Whether manual approval of follow requests is required.",
                     }),
-                    bot: AccountSchema.shape.bot.meta({
+                    bot: AccountSchema.shape.bot.openapi({
                         description: "Whether the account has a bot flag.",
                     }),
                     discoverable: AccountSchema.shape.discoverable
                         .unwrap()
-                        .meta({
+                        .openapi({
                             description:
                                 "Whether the account should be shown in the profile directory.",
                         }),
-                    hide_collections: zBoolean.meta({
+                    hide_collections: zBoolean.openapi({
                         description:
                             "Whether to hide followers and followed accounts.",
                     }),
-                    indexable: zBoolean.meta({
+                    indexable: zBoolean.openapi({
                         description:
                             "Whether public posts should be searchable to anyone.",
                     }),
                     // TODO: Implement :(
-                    attribution_domains: z.array(z.string()).meta({
+                    attribution_domains: z.array(z.string()).openapi({
                         description:
                             "Domains of websites allowed to credit the account.",
                         example: ["cnn.com", "myblog.com"],
@@ -234,7 +242,7 @@ export default apiRoute((app) =>
 
             if (note) {
                 self.source.note = note;
-                self.note = await versiaTextToHtml(
+                self.note = await contentToHtml(
                     new VersiaEntities.TextContentFormat({
                         "text/markdown": {
                             content: note,
@@ -274,9 +282,9 @@ export default apiRoute((app) =>
                         user.avatar = await Media.fromFile(avatar);
                     }
                 } else if (user.avatar) {
-                    await user.avatar.updateFromUrl(new URL(avatar));
+                    await user.avatar.updateFromUrl(avatar);
                 } else {
-                    user.avatar = await Media.fromUrl(new URL(avatar));
+                    user.avatar = await Media.fromUrl(avatar);
                 }
             }
 
@@ -288,9 +296,9 @@ export default apiRoute((app) =>
                         user.header = await Media.fromFile(header);
                     }
                 } else if (user.header) {
-                    await user.header.updateFromUrl(new URL(header));
+                    await user.header.updateFromUrl(header);
                 } else {
-                    user.header = await Media.fromUrl(new URL(header));
+                    user.header = await Media.fromUrl(header);
                 }
             }
 
@@ -321,7 +329,7 @@ export default apiRoute((app) =>
                 self.source.fields = [];
                 for (const field of fields_attributes) {
                     // Can be Markdown or plaintext, also has emojis
-                    const parsedName = await versiaTextToHtml(
+                    const parsedName = await contentToHtml(
                         new VersiaEntities.TextContentFormat({
                             "text/markdown": {
                                 content: field.name,
@@ -332,7 +340,7 @@ export default apiRoute((app) =>
                         true,
                     );
 
-                    const parsedValue = await versiaTextToHtml(
+                    const parsedValue = await contentToHtml(
                         new VersiaEntities.TextContentFormat({
                             "text/markdown": {
                                 content: field.value,

api/api/v1/accounts/verify_credentials/index.test.ts

@@ -1,6 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { config } from "@versia-server/config";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { config } from "~/config";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(1);
 

api/api/v1/accounts/verify_credentials/index.ts

@@ -1,7 +1,8 @@
 import { Account } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth } from "@versia-server/kit/api";
-import { describeRoute, resolver } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(

api/api/v1/apps/index.ts

@@ -2,13 +2,15 @@ import {
     Application as ApplicationSchema,
     CredentialApplication as CredentialApplicationSchema,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, handleZodError, jsonOrForm } from "@versia-server/kit/api";
-import { Client } from "@versia-server/kit/db";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { Application } from "@versia/kit/db";
+import { randomUUIDv7 } from "bun";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, handleZodError, jsonOrForm } from "@/api";
 import { randomString } from "@/math";
-import { rateLimit } from "../../../../middlewares/rate-limit.ts";
+import { ApiError } from "~/classes/errors/api-error";
+import { rateLimit } from "~/middlewares/rate-limit";
 
 export default apiRoute((app) =>
     app.post(
@@ -41,20 +43,22 @@ export default apiRoute((app) =>
             z.object({
                 client_name: ApplicationSchema.shape.name,
                 redirect_uris: ApplicationSchema.shape.redirect_uris.or(
-                    ApplicationSchema.shape.redirect_uri,
+                    ApplicationSchema.shape.redirect_uri.transform((u) =>
+                        u.split("\n"),
+                    ),
                 ),
-                scopes: z.string().default("read").meta({
-                    description: "Space separated list of scopes.",
-                    type: "string",
-                }),
+                scopes: z
+                    .string()
+                    .default("read")
+                    .transform((s) => s.split(" "))
+                    .openapi({
+                        description: "Space separated list of scopes.",
+                    }),
                 // Allow empty websites because Traewelling decides to give an empty
                 // value instead of not providing anything at all
                 website: ApplicationSchema.shape.website
                     .optional()
-                    .or(z.literal(""))
-                    .meta({
-                        type: "string",
-                    }),
+                    .or(z.literal("").transform(() => undefined)),
             }),
             handleZodError,
         ),
@@ -62,14 +66,13 @@ export default apiRoute((app) =>
             const { client_name, redirect_uris, scopes, website } =
                 context.req.valid("json");
 
-            const app = await Client.insert({
-                id: randomString(32, "base64url"),
+            const app = await Application.insert({
+                id: randomUUIDv7(),
                 name: client_name,
-                redirectUris: Array.isArray(redirect_uris)
-                    ? redirect_uris
-                    : [redirect_uris],
-                scopes: scopes.split(" "),
-                website: website || undefined,
+                redirectUri: redirect_uris.join("\n"),
+                scopes: scopes.join(" "),
+                website,
+                clientId: randomString(32, "base64url"),
                 secret: randomString(64, "base64url"),
             });
 

api/api/v1/apps/verify_credentials/index.ts

@@ -2,10 +2,11 @@ import {
     Application as ApplicationSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth } from "@versia-server/kit/api";
-import { Client } from "@versia-server/kit/db";
-import { describeRoute, resolver } from "hono-openapi";
+import { Application } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(
@@ -38,7 +39,7 @@ export default apiRoute((app) =>
         async (context) => {
             const { token } = context.get("auth");
 
-            const application = await Client.getFromToken(
+            const application = await Application.getFromToken(
                 token.data.accessToken,
             );
 

api/api/v1/blocks/index.test.ts

@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(3);
 

api/api/v1/blocks/index.ts

@@ -2,13 +2,14 @@ import {
     Account as AccountSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, handleZodError } from "@versia-server/kit/api";
-import { Timeline } from "@versia-server/kit/db";
-import { Users } from "@versia-server/kit/tables";
+import { Timeline } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(
@@ -32,7 +33,7 @@ export default apiRoute((app) =>
                         link: z
                             .string()
                             .optional()
-                            .meta({
+                            .openapi({
                                 description:
                                     "Links to the next and previous pages",
                                 example:
@@ -55,24 +56,30 @@ export default apiRoute((app) =>
         validator(
             "query",
             z.object({
-                max_id: AccountSchema.shape.id.optional().meta({
+                max_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be lesser than this ID. In effect, sets an upper bound on results.",
                     example: "8d35243d-b959-43e2-8bac-1a9d4eaea2aa",
                 }),
-                since_id: AccountSchema.shape.id.optional().meta({
+                since_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be greater than this ID. In effect, sets a lower bound on results.",
                     example: undefined,
                 }),
-                min_id: AccountSchema.shape.id.optional().meta({
+                min_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "Returns results immediately newer than this ID. In effect, sets a cursor at this ID and paginates forward.",
                     example: undefined,
                 }),
-                limit: z.coerce.number().int().min(1).max(80).default(40).meta({
-                    description: "Maximum number of results to return.",
-                }),
+                limit: z.coerce
+                    .number()
+                    .int()
+                    .min(1)
+                    .max(80)
+                    .default(40)
+                    .openapi({
+                        description: "Maximum number of results to return.",
+                    }),
             }),
             handleZodError,
         ),

api/api/v1/challenges/index.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { generateClient } from "@versia-server/tests";
+import { generateClient } from "~/tests/utils";
 
 // /api/v1/challenges
 describe("/api/v1/challenges", () => {

api/api/v1/challenges/index.ts

@@ -1,9 +1,10 @@
 import { Challenge } from "@versia/client/schemas";
-import { config } from "@versia-server/config";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth } from "@versia-server/kit/api";
-import { describeRoute, resolver } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute, auth } from "@/api";
 import { generateChallenge } from "@/challenges";
+import { ApiError } from "~/classes/errors/api-error";
+import { config } from "~/config.ts";
 
 export default apiRoute((app) =>
     app.post(

api/api/v1/custom_emojis/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { db } from "@versia-server/kit/db";
-import { Emojis } from "@versia-server/kit/tables";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { db } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import { inArray } from "drizzle-orm";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 

api/api/v1/custom_emojis/index.ts

@@ -2,13 +2,14 @@ import {
     CustomEmoji as CustomEmojiSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth } from "@versia-server/kit/api";
-import { Emoji } from "@versia-server/kit/db";
-import { Emojis } from "@versia-server/kit/tables";
+import { Emoji } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import { and, eq, isNull, or } from "drizzle-orm";
-import { describeRoute, resolver } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(

api/api/v1/emojis/[id]/index.test.ts

@@ -1,8 +1,8 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { db } from "@versia-server/kit/db";
-import { Emojis } from "@versia-server/kit/tables";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { db } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import { inArray } from "drizzle-orm";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(2);
 let id = "";

api/api/v1/emojis/[id]/index.ts

@@ -2,18 +2,19 @@ import {
     CustomEmoji as CustomEmojiSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { config } from "@versia-server/config";
-import { ApiError } from "@versia-server/kit";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
+import { z } from "zod";
 import {
     apiRoute,
     auth,
     handleZodError,
     jsonOrForm,
     withEmojiParam,
-} from "@versia-server/kit/api";
-import { describeRoute, resolver, validator } from "hono-openapi";
-import { z } from "zod";
+} from "@/api";
 import { mimeLookup } from "@/content_types";
+import { ApiError } from "~/classes/errors/api-error";
+import { config } from "~/config.ts";
 
 export default apiRoute((app) => {
     app.get(
@@ -112,28 +113,29 @@ export default apiRoute((app) => {
             "json",
             z
                 .object({
-                    shortcode: CustomEmojiSchema.shape.shortcode
-                        .max(config.validation.emojis.max_shortcode_characters)
-                        .refine(
-                            (s) =>
-                                !config.validation.filters.emoji_shortcode.some(
-                                    (filter) => filter.test(s),
-                                ),
-                            "Shortcode contains blocked words",
-                        ),
+                    shortcode: CustomEmojiSchema.shape.shortcode.max(
+                        config.validation.emojis.max_shortcode_characters,
+                    ),
                     element: z
+                        .string()
                         .url()
-                        .meta({
+                        .transform((a) => new URL(a))
+                        .openapi({
                             description: "Emoji image URL",
                         })
                         .or(
                             z
-                                .file()
-                                .max(config.validation.emojis.max_bytes)
-                                .meta({
+                                .instanceof(File)
+                                .openapi({
                                     description:
                                         "Emoji image encoded using multipart/form-data",
-                                }),
+                                })
+                                .refine(
+                                    (v) =>
+                                        v.size <=
+                                        config.validation.emojis.max_bytes,
+                                    `Emoji must be less than ${config.validation.emojis.max_bytes} bytes`,
+                                ),
                         ),
                     category: CustomEmojiSchema.shape.category.optional(),
                     alt: CustomEmojiSchema.shape.description
@@ -187,7 +189,7 @@ export default apiRoute((app) => {
                 const contentType =
                     element instanceof File
                         ? element.type
-                        : await mimeLookup(new URL(element));
+                        : await mimeLookup(element);
 
                 if (!contentType.startsWith("image/")) {
                     throw new ApiError(
@@ -200,7 +202,7 @@ export default apiRoute((app) => {
                 if (element instanceof File) {
                     await emoji.media.updateFromFile(element);
                 } else {
-                    await emoji.media.updateFromUrl(new URL(element));
+                    await emoji.media.updateFromUrl(element);
                 }
             }
 

api/api/v1/emojis/index.test.ts

@@ -1,9 +1,9 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { db } from "@versia-server/kit/db";
-import { Emojis } from "@versia-server/kit/tables";
-import { generateClient, getTestUsers } from "@versia-server/tests";
+import { db } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import { inArray } from "drizzle-orm";
 import sharp from "sharp";
+import { generateClient, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(3);
 
@@ -32,7 +32,7 @@ const createImage = async (name: string): Promise<File> => {
         .png()
         .toBuffer();
 
-    return new File([inputBuffer as BlobPart], name, {
+    return new File([inputBuffer], name, {
         type: "image/png",
     });
 };

api/api/v1/emojis/index.ts

@@ -2,21 +2,17 @@ import {
     CustomEmoji as CustomEmojiSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { config } from "@versia-server/config";
-import { ApiError } from "@versia-server/kit";
-import {
-    apiRoute,
-    auth,
-    handleZodError,
-    jsonOrForm,
-} from "@versia-server/kit/api";
-import { Emoji, Media } from "@versia-server/kit/db";
-import { Emojis } from "@versia-server/kit/tables";
+import { Emoji, Media } from "@versia/kit/db";
+import { Emojis } from "@versia/kit/tables";
 import { randomUUIDv7 } from "bun";
 import { and, eq, isNull, or } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError, jsonOrForm } from "@/api";
 import { mimeLookup } from "@/content_types";
+import { ApiError } from "~/classes/errors/api-error";
+import { config } from "~/config.ts";
 
 export default apiRoute((app) =>
     app.post(
@@ -49,25 +45,29 @@ export default apiRoute((app) =>
         validator(
             "json",
             z.object({
-                shortcode: CustomEmojiSchema.shape.shortcode
-                    .max(config.validation.emojis.max_shortcode_characters)
-                    .refine(
-                        (s) =>
-                            !config.validation.filters.emoji_shortcode.some(
-                                (filter) => filter.test(s),
-                            ),
-                        "Shortcode contains blocked words",
-                    ),
+                shortcode: CustomEmojiSchema.shape.shortcode.max(
+                    config.validation.emojis.max_shortcode_characters,
+                ),
                 element: z
+                    .string()
                     .url()
-                    .meta({
+                    .transform((a) => new URL(a))
+                    .openapi({
                         description: "Emoji image URL",
                     })
                     .or(
-                        z.file().max(config.validation.emojis.max_bytes).meta({
-                            description:
-                                "Emoji image encoded using multipart/form-data",
-                        }),
+                        z
+                            .instanceof(File)
+                            .openapi({
+                                description:
+                                    "Emoji image encoded using multipart/form-data",
+                            })
+                            .refine(
+                                (v) =>
+                                    v.size <=
+                                    config.validation.emojis.max_bytes,
+                                `Emoji must be less than ${config.validation.emojis.max_bytes} bytes`,
+                            ),
                     ),
                 category: CustomEmojiSchema.shape.category.optional(),
                 alt: CustomEmojiSchema.shape.description
@@ -112,7 +112,7 @@ export default apiRoute((app) =>
             const contentType =
                 element instanceof File
                     ? element.type
-                    : await mimeLookup(new URL(element));
+                    : await mimeLookup(element);
 
             if (!contentType.startsWith("image/")) {
                 throw new ApiError(
@@ -127,7 +127,7 @@ export default apiRoute((app) =>
                     ? await Media.fromFile(element, {
                           description: alt ?? undefined,
                       })
-                    : await Media.fromUrl(new URL(element), {
+                    : await Media.fromUrl(element, {
                           description: alt ?? undefined,
                       });
 

api/api/v1/favourites/index.ts

@@ -1,11 +1,12 @@
 import { RolePermission, Status as StatusSchema } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, handleZodError } from "@versia-server/kit/api";
-import { Timeline } from "@versia-server/kit/db";
-import { Notes } from "@versia-server/kit/tables";
+import { Timeline } from "@versia/kit/db";
+import { Notes } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(
@@ -29,7 +30,7 @@ export default apiRoute((app) =>
                         link: z
                             .string()
                             .optional()
-                            .meta({
+                            .openapi({
                                 description:
                                     "Links to the next and previous pages",
                                 example:
@@ -51,24 +52,30 @@ export default apiRoute((app) =>
         validator(
             "query",
             z.object({
-                max_id: StatusSchema.shape.id.optional().meta({
+                max_id: StatusSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be lesser than this ID. In effect, sets an upper bound on results.",
                     example: "8d35243d-b959-43e2-8bac-1a9d4eaea2aa",
                 }),
-                since_id: StatusSchema.shape.id.optional().meta({
+                since_id: StatusSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be greater than this ID. In effect, sets a lower bound on results.",
                     example: undefined,
                 }),
-                min_id: StatusSchema.shape.id.optional().meta({
+                min_id: StatusSchema.shape.id.optional().openapi({
                     description:
                         "Returns results immediately newer than this ID. In effect, sets a cursor at this ID and paginates forward.",
                     example: undefined,
                 }),
-                limit: z.coerce.number().int().min(1).max(80).default(40).meta({
-                    description: "Maximum number of results to return.",
-                }),
+                limit: z.coerce
+                    .number()
+                    .int()
+                    .min(1)
+                    .max(80)
+                    .default(40)
+                    .openapi({
+                        description: "Maximum number of results to return.",
+                    }),
             }),
             handleZodError,
         ),

api/api/v1/follow_requests/[account_id]/authorize.ts

@@ -3,11 +3,12 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, handleZodError } from "@versia-server/kit/api";
-import { Relationship, User } from "@versia-server/kit/db";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { Relationship, User } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.post(

api/api/v1/follow_requests/[account_id]/reject.ts

@@ -3,11 +3,12 @@ import {
     Relationship as RelationshipSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, handleZodError } from "@versia-server/kit/api";
-import { Relationship, User } from "@versia-server/kit/db";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { Relationship, User } from "@versia/kit/db";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.post(

api/api/v1/follow_requests/index.ts

@@ -2,13 +2,14 @@ import {
     Account as AccountSchema,
     RolePermission,
 } from "@versia/client/schemas";
-import { ApiError } from "@versia-server/kit";
-import { apiRoute, auth, handleZodError } from "@versia-server/kit/api";
-import { Timeline } from "@versia-server/kit/db";
-import { Users } from "@versia-server/kit/tables";
+import { Timeline } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, gt, gte, lt, sql } from "drizzle-orm";
-import { describeRoute, resolver, validator } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver, validator } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute, auth, handleZodError } from "@/api";
+import { ApiError } from "~/classes/errors/api-error";
 
 export default apiRoute((app) =>
     app.get(
@@ -34,7 +35,7 @@ export default apiRoute((app) =>
                         link: z
                             .string()
                             .optional()
-                            .meta({
+                            .openapi({
                                 description:
                                     "Links to the next and previous pages",
                                 example:
@@ -56,24 +57,30 @@ export default apiRoute((app) =>
         validator(
             "query",
             z.object({
-                max_id: AccountSchema.shape.id.optional().meta({
+                max_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be lesser than this ID. In effect, sets an upper bound on results.",
                     example: "8d35243d-b959-43e2-8bac-1a9d4eaea2aa",
                 }),
-                since_id: AccountSchema.shape.id.optional().meta({
+                since_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "All results returned will be greater than this ID. In effect, sets a lower bound on results.",
                     example: undefined,
                 }),
-                min_id: AccountSchema.shape.id.optional().meta({
+                min_id: AccountSchema.shape.id.optional().openapi({
                     description:
                         "Returns results immediately newer than this ID. In effect, sets a cursor at this ID and paginates forward.",
                     example: undefined,
                 }),
-                limit: z.coerce.number().int().min(1).max(80).default(40).meta({
-                    description: "Maximum number of results to return.",
-                }),
+                limit: z.coerce
+                    .number()
+                    .int()
+                    .min(1)
+                    .max(80)
+                    .default(40)
+                    .openapi({
+                        description: "Maximum number of results to return.",
+                    }),
             }),
             handleZodError,
         ),

api/api/v1/frontend/config/index.ts

@@ -1,7 +1,8 @@
-import { config } from "@versia-server/config";
-import { apiRoute } from "@versia-server/kit/api";
-import { describeRoute, resolver } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute } from "@/api";
+import { config } from "~/config.ts";
 
 export default apiRoute((app) =>
     app.get(

api/api/v1/instance/extended_description.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { generateClient } from "@versia-server/tests";
+import { generateClient } from "~/tests/utils";
 
 // /api/v1/instance/extended_description
 describe("/api/v1/instance/extended_description", () => {

api/api/v1/instance/extended_description.ts

@@ -1,8 +1,9 @@
 import { ExtendedDescription as ExtendedDescriptionSchema } from "@versia/client/schemas";
-import { config } from "@versia-server/config";
-import { apiRoute } from "@versia-server/kit/api";
-import { markdownToHtml } from "@versia-server/kit/markdown";
-import { describeRoute, resolver } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute } from "@/api";
+import { markdownParse } from "~/classes/functions/status";
+import { config } from "~/config.ts";
 
 export default apiRoute((app) =>
     app.get(
@@ -26,7 +27,7 @@ export default apiRoute((app) =>
             },
         }),
         async (context) => {
-            const content = await markdownToHtml(
+            const content = await markdownParse(
                 config.instance.extended_description_path?.content ??
                     "This is a [Versia](https://versia.pub) server with the default extended description.",
             );

api/api/v1/instance/index.ts

@@ -1,13 +1,14 @@
 import { InstanceV1 as InstanceV1Schema } from "@versia/client/schemas";
-import { config } from "@versia-server/config";
-import { apiRoute } from "@versia-server/kit/api";
-import { Instance, Note, User } from "@versia-server/kit/db";
-import { markdownToHtml } from "@versia-server/kit/markdown";
-import { Users } from "@versia-server/kit/tables";
+import { Instance, Note, User } from "@versia/kit/db";
+import { Users } from "@versia/kit/tables";
 import { and, eq, isNull } from "drizzle-orm";
-import { describeRoute, resolver } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
 import type { z } from "zod";
-import manifest from "../../../../../../package.json" with { type: "json" };
+import { apiRoute } from "@/api";
+import { markdownParse } from "~/classes/functions/status";
+import { config } from "~/config.ts";
+import manifest from "~/package.json";
 
 export default apiRoute((app) =>
     app.get(
@@ -48,7 +49,18 @@ export default apiRoute((app) =>
 
             const knownDomainsCount = await Instance.getCount();
 
-            const content = await markdownToHtml(
+            const oidcConfig = config.plugins?.config?.["@versia/openid"] as
+                | {
+                      forced?: boolean;
+                      providers?: {
+                          id: string;
+                          name: string;
+                          icon?: string;
+                      }[];
+                  }
+                | undefined;
+
+            const content = await markdownParse(
                 config.instance.extended_description_path?.content ??
                     "This is a [Versia](https://versia.pub) server with the default extended description.",
             );
@@ -110,14 +122,15 @@ export default apiRoute((app) =>
                 },
                 version: "4.3.0-alpha.3+glitch",
                 versia_version: version,
+                // TODO: Put into plugin directly
                 sso: {
-                    providers: config.authentication.openid_providers.map(
-                        (p) => ({
+                    forced: oidcConfig?.forced ?? false,
+                    providers:
+                        oidcConfig?.providers?.map((p) => ({
                             name: p.name,
-                            icon: p.icon?.href,
+                            icon: p.icon,
                             id: p.id,
-                        }),
-                    ),
+                        })) ?? [],
                 },
                 contact_account: (contactAccount as User)?.toApi(),
             } satisfies z.infer<typeof InstanceV1Schema>);

api/api/v1/instance/privacy_policy.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { generateClient } from "@versia-server/tests";
+import { generateClient } from "~/tests/utils";
 
 // /api/v1/instance/privacy_policy
 describe("/api/v1/instance/privacy_policy", () => {

api/api/v1/instance/privacy_policy.ts

@@ -1,8 +1,9 @@
 import { PrivacyPolicy as PrivacyPolicySchema } from "@versia/client/schemas";
-import { config } from "@versia-server/config";
-import { apiRoute } from "@versia-server/kit/api";
-import { markdownToHtml } from "@versia-server/kit/markdown";
-import { describeRoute, resolver } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute } from "@/api";
+import { markdownParse } from "~/classes/functions/status";
+import { config } from "~/config.ts";
 
 export default apiRoute((app) =>
     app.get(
@@ -26,7 +27,7 @@ export default apiRoute((app) =>
             },
         }),
         async (context) => {
-            const content = await markdownToHtml(
+            const content = await markdownParse(
                 config.instance.privacy_policy_path?.content ??
                     "This instance has not provided any privacy policy.",
             );

api/api/v1/instance/rules.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
-import { config } from "@versia-server/config";
-import { generateClient } from "@versia-server/tests";
+import { config } from "~/config.ts";
+import { generateClient } from "~/tests/utils";
 
 // /api/v1/instance/rules
 describe("/api/v1/instance/rules", () => {

api/api/v1/instance/rules.ts

@@ -1,8 +1,9 @@
 import { Rule as RuleSchema } from "@versia/client/schemas";
-import { config } from "@versia-server/config";
-import { apiRoute } from "@versia-server/kit/api";
-import { describeRoute, resolver } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
 import { z } from "zod";
+import { apiRoute } from "@/api";
+import { config } from "~/config.ts";
 
 export default apiRoute((app) =>
     app.get(

api/api/v1/instance/terms_of_service.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { generateClient } from "@versia-server/tests";
+import { generateClient } from "~/tests/utils";
 
 // /api/v1/instance/terms_of_service
 describe("/api/v1/instance/terms_of_service", () => {

api/api/v1/instance/terms_of_service.ts

@@ -1,8 +1,9 @@
 import { TermsOfService as TermsOfServiceSchema } from "@versia/client/schemas";
-import { config } from "@versia-server/config";
-import { apiRoute } from "@versia-server/kit/api";
-import { markdownToHtml } from "@versia-server/kit/markdown";
-import { describeRoute, resolver } from "hono-openapi";
+import { describeRoute } from "hono-openapi";
+import { resolver } from "hono-openapi/zod";
+import { apiRoute } from "@/api";
+import { markdownParse } from "~/classes/functions/status";
+import { config } from "~/config.ts";
 
 export default apiRoute((app) =>
     app.get(
@@ -27,7 +28,7 @@ export default apiRoute((app) =>
             },
         }),
         async (context) => {
-            const content = await markdownToHtml(
+            const content = await markdownParse(
                 config.instance.tos_path?.content ??
                     "This instance has not provided any terms of service.",
             );

api/api/v1/markers/index.test.ts

@@ -1,9 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import {
-    generateClient,
-    getTestStatuses,
-    getTestUsers,
-} from "@versia-server/tests";
+import { generateClient, getTestStatuses, getTestUsers } from "~/tests/utils";
 
 const { users, deleteUsers } = await getTestUsers(1);
 const timeline = await getTestStatuses(10, users[0]);