From 320d2f493ee43dfcdbb82ec78a590a77e151d169 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sat, 26 Aug 2023 23:13:48 -0500 Subject: [PATCH] change .positive() to .nonnegative() !!! --- src/controllers/api/accounts.ts | 2 +- src/schemas/nostr.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/controllers/api/accounts.ts b/src/controllers/api/accounts.ts index 95fe0c7f..92445622 100644 --- a/src/controllers/api/accounts.ts +++ b/src/controllers/api/accounts.ts @@ -82,7 +82,7 @@ const relationshipsController: AppController = async (c) => { const accountStatusesQuerySchema = z.object({ pinned: booleanParamSchema.optional(), - limit: z.coerce.number().positive().transform((v) => Math.min(v, 40)).catch(20), + limit: z.coerce.number().nonnegative().transform((v) => Math.min(v, 40)).catch(20), exclude_replies: booleanParamSchema.optional(), tagged: z.string().optional(), }); diff --git a/src/schemas/nostr.ts b/src/schemas/nostr.ts index 4147c3ca..272981fd 100644 --- a/src/schemas/nostr.ts +++ b/src/schemas/nostr.ts @@ -5,7 +5,7 @@ import { jsonSchema, safeUrlSchema } from '../schema.ts'; /** Schema to validate Nostr hex IDs such as event IDs and pubkeys. */ const nostrIdSchema = z.string().regex(/^[0-9a-f]{64}$/); /** Nostr kinds are positive integers. */ -const kindSchema = z.number().int().positive(); +const kindSchema = z.number().int().nonnegative(); /** Nostr event schema. */ const eventSchema = z.object({ @@ -26,9 +26,9 @@ const filterSchema = z.object({ kinds: kindSchema.array().optional(), ids: nostrIdSchema.array().optional(), authors: nostrIdSchema.array().optional(), - since: z.number().int().positive().optional(), - until: z.number().int().positive().optional(), - limit: z.number().int().positive().optional(), + since: z.number().int().nonnegative().optional(), + until: z.number().int().nonnegative().optional(), + limit: z.number().int().nonnegative().optional(), }).passthrough().and( z.record( z.custom<`#${string}`>((val) => typeof val === 'string' && val.startsWith('#')), @@ -75,7 +75,7 @@ const relayInfoDocSchema = z.object({ description: z.string().transform((val) => val.slice(0, 3000)).optional().catch(undefined), pubkey: nostrIdSchema.optional().catch(undefined), contact: safeUrlSchema.optional().catch(undefined), - supported_nips: z.number().int().positive().array().optional().catch(undefined), + supported_nips: z.number().int().nonnegative().array().optional().catch(undefined), software: safeUrlSchema.optional().catch(undefined), icon: safeUrlSchema.optional().catch(undefined), });