diff --git a/drizzle/schema.ts b/drizzle/schema.ts index d1975a97..43ccfd83 100644 --- a/drizzle/schema.ts +++ b/drizzle/schema.ts @@ -344,7 +344,7 @@ export const Instances = pgTable("Instances", { baseUrl: text("base_url").notNull(), name: text("name").notNull(), version: text("version").notNull(), - logo: jsonb("logo"), + logo: jsonb("logo").$type(), disableAutomoderation: boolean("disable_automoderation") .default(false) .notNull(), diff --git a/server/api/api/v1/instance/index.ts b/server/api/api/v1/instance/index.ts index f218aa4f..1f976857 100644 --- a/server/api/api/v1/instance/index.ts +++ b/server/api/api/v1/instance/index.ts @@ -38,7 +38,7 @@ export default (app: Hono) => and(isNull(Users.instanceId), eq(Users.isAdmin, true)), ); - const knownDomainsCount = Instance.getCount(); + const knownDomainsCount = await Instance.getCount(); // TODO: fill in more values return jsonResponse({ diff --git a/utils/response.ts b/utils/response.ts index d1376af3..d491e831 100644 --- a/utils/response.ts +++ b/utils/response.ts @@ -27,8 +27,17 @@ export const response = ( }); }; +export type Json = + | string + | number + | boolean + | null + | undefined + | Json[] + | { [key: string]: Json }; + export const jsonResponse = ( - data: object, + data: Json, status = 200, headers: Record = {}, ) => {