diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 3428d332..00000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "packages/lysand-api"] - path = packages/lysand-api - url = https://github.com/lysand-org/api.git diff --git a/bun.lockb b/bun.lockb index 8159ae35..6fce8675 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index c73ee80e..c4475f74 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "@inquirer/confirm": "^3.1.9", "@inquirer/input": "^2.1.9", "@json2csv/plainjs": "^7.0.6", - "@lysand-org/federation": "^1.1.8", + "@lysand-org/federation": "1.1.9", "@oclif/core": "^3.26.9", "@tufjs/canonical-json": "^2.0.0", "blurhash": "^2.0.5", diff --git a/packages/lysand-api b/packages/lysand-api deleted file mode 160000 index 69be6967..00000000 --- a/packages/lysand-api +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 69be6967bd0f0018ac5951238639f49f7c93206e diff --git a/server/api/users/:uuid/inbox/index.ts b/server/api/users/:uuid/inbox/index.ts index 476391f2..62794ec4 100644 --- a/server/api/users/:uuid/inbox/index.ts +++ b/server/api/users/:uuid/inbox/index.ts @@ -2,6 +2,11 @@ import { applyConfig, debugRequest, handleZodError } from "@/api"; import { dualLogger } from "@/loggers"; import { errorResponse, jsonResponse, response } from "@/response"; import { zValidator } from "@hono/zod-validator"; +import { + EntityValidator, + RequestParserHandler, + SignatureValidator, +} from "@lysand-org/federation"; import type { SocketAddress } from "bun"; import { eq } from "drizzle-orm"; import type { Hono } from "hono"; @@ -18,11 +23,6 @@ import { config } from "~/packages/config-manager"; import { Note } from "~/packages/database-interface/note"; import { User } from "~/packages/database-interface/user"; import { LogLevel, LogManager } from "~/packages/log-manager"; -import { - EntityValidator, - RequestParserHandler, - SignatureValidator, -} from "~/packages/lysand-api/federation"; export const meta = applyConfig({ allowedMethods: ["POST"],