diff --git a/biome.json b/biome.json index e7011d24..94fc81b1 100644 --- a/biome.json +++ b/biome.json @@ -6,7 +6,8 @@ "node_modules/**/*", "dist/**/*", "packages/frontend/.output", - "packages/frontend/.nuxt" + "packages/frontend/.nuxt", + "glitch" ] }, "linter": { @@ -18,7 +19,8 @@ "node_modules/**/*", "dist/**/*", "packages/frontend/.output", - "packages/frontend/.nuxt" + "packages/frontend/.nuxt", + "glitch" ] }, "formatter": { @@ -29,7 +31,8 @@ "node_modules/**/*", "dist/**/*", "packages/frontend/.output", - "packages/frontend/.nuxt" + "packages/frontend/.nuxt", + "glitch" ] } } diff --git a/index.ts b/index.ts index 91c34283..647b1eb1 100644 --- a/index.ts +++ b/index.ts @@ -1,3 +1,4 @@ +import { dualLogger } from "@loggers"; import { connectMeili } from "@meilisearch"; import { config } from "config-manager"; import { count } from "drizzle-orm"; @@ -5,7 +6,6 @@ import { LogLevel, LogManager, type MultiLogManager } from "log-manager"; import { db, setupDatabase } from "~drizzle/db"; import { status } from "~drizzle/schema"; import { createServer } from "~server"; -import { dualLogger } from "@loggers"; const timeAtStart = performance.now(); diff --git a/packages/glitch-server/main.ts b/packages/glitch-server/main.ts index cac5a745..bd7e1431 100644 --- a/packages/glitch-server/main.ts +++ b/packages/glitch-server/main.ts @@ -1,7 +1,7 @@ +import { join } from "node:path"; import { dualLogger } from "@loggers"; import { errorResponse } from "@response"; import { config } from "config-manager"; -import { join } from "node:path"; import { LogLevel, type LogManager, diff --git a/server/api/api/v1/instance/extended_description.test.ts b/server/api/api/v1/instance/extended_description.test.ts index d8c59296..535a86a3 100644 --- a/server/api/api/v1/instance/extended_description.test.ts +++ b/server/api/api/v1/instance/extended_description.test.ts @@ -1,7 +1,7 @@ import { describe, expect, test } from "bun:test"; -import { meta } from "./extended_description"; -import { sendTestRequest } from "~tests/utils"; import { config } from "config-manager"; +import { sendTestRequest } from "~tests/utils"; +import { meta } from "./extended_description"; // /api/v1/instance/extended_description describe(meta.route, () => { diff --git a/server/api/api/v1/instance/rules.test.ts b/server/api/api/v1/instance/rules.test.ts index cb00e9b1..64dbf6ca 100644 --- a/server/api/api/v1/instance/rules.test.ts +++ b/server/api/api/v1/instance/rules.test.ts @@ -1,7 +1,7 @@ import { describe, expect, test } from "bun:test"; -import { meta } from "./rules"; -import { sendTestRequest } from "~tests/utils"; import { config } from "config-manager"; +import { sendTestRequest } from "~tests/utils"; +import { meta } from "./rules"; // /api/v1/instance/rules describe(meta.route, () => { diff --git a/server/api/api/v2/instance/index.test.ts b/server/api/api/v2/instance/index.test.ts index 1435d296..10c8532c 100644 --- a/server/api/api/v2/instance/index.test.ts +++ b/server/api/api/v2/instance/index.test.ts @@ -1,7 +1,7 @@ import { describe, expect, test } from "bun:test"; -import { meta } from "./index"; -import { sendTestRequest } from "~tests/utils"; import { config } from "config-manager"; +import { sendTestRequest } from "~tests/utils"; +import { meta } from "./index"; // /api/v2/instance describe(meta.route, () => { diff --git a/server/api/api/v2/instance/index.ts b/server/api/api/v2/instance/index.ts index 7dbd02d2..d4fac8b3 100644 --- a/server/api/api/v2/instance/index.ts +++ b/server/api/api/v2/instance/index.ts @@ -1,11 +1,10 @@ import { apiRoute, applyConfig } from "@api"; import { jsonResponse } from "@response"; -import { and, count, countDistinct, eq, gte, isNull } from "drizzle-orm"; +import { and, countDistinct, eq, gte, isNull } from "drizzle-orm"; import { findFirstUser, userToAPI } from "~database/entities/User"; import { db } from "~drizzle/db"; -import { instance, status, user } from "~drizzle/schema"; +import { status, user } from "~drizzle/schema"; import manifest from "~package.json"; -import type { Instance as APIInstance } from "~types/mastodon/instance"; export const meta = applyConfig({ allowedMethods: ["GET"], @@ -108,6 +107,9 @@ export default apiRoute(async (req, matchedRoute, extraData) => { email: contactAccount?.email || null, account: contactAccount ? userToAPI(contactAccount) : null, }, - rules: [], + rules: config.signups.rules.map((rule, index) => ({ + id: String(index), + text: rule, + })), }); });