Remove zod schemas that we can get from NSchema

src/controllers/api/accounts.ts

@@ -1,4 +1,4 @@
-import { NostrFilter } from '@nostrify/nostrify';
+import { NostrFilter, NSchema as n } from '@nostrify/nostrify';
 import { nip19 } from 'nostr-tools';
 import { z } from 'zod';
 
@@ -6,7 +6,6 @@ import { type AppController } from '@/app.ts';
 import { Conf } from '@/config.ts';
 import { getAuthor, getFollowedPubkeys } from '@/queries.ts';
 import { booleanParamSchema, fileSchema } from '@/schema.ts';
-import { jsonMetaContentSchema } from '@/schemas/nostr.ts';
 import { Storages } from '@/storages.ts';
 import { addTag, deleteTag, findReplyTag, getTagSet } from '@/tags.ts';
 import { uploadFile } from '@/upload.ts';
@@ -198,7 +197,7 @@ const updateCredentialsController: AppController = async (c) => {
   }
 
   const author = await getAuthor(pubkey);
-  const meta = author ? jsonMetaContentSchema.parse(author.content) : {};
+  const meta = author ? n.json().pipe(n.metadata()).parse(author.content) : {};
 
   const {
     avatar: avatarFile,

src/controllers/api/instance.ts

@@ -1,6 +1,8 @@
+import { NSchema as n } from '@nostrify/nostrify';
+
 import { type AppController } from '@/app.ts';
 import { Conf } from '@/config.ts';
-import { jsonServerMetaSchema } from '@/schemas/nostr.ts';
+import { serverMetaSchema } from '@/schemas/nostr.ts';
 import { Storages } from '@/storages.ts';
 
 const instanceController: AppController = async (c) => {
@@ -8,7 +10,7 @@ const instanceController: AppController = async (c) => {
   const { signal } = c.req.raw;
 
   const [event] = await Storages.db.query([{ kinds: [0], authors: [Conf.pubkey], limit: 1 }], { signal });
-  const meta = jsonServerMetaSchema.parse(event?.content);
+  const meta = n.json().pipe(serverMetaSchema).parse(event?.content);
 
   /** Protocol to use for WebSocket URLs, depending on the protocol of the `LOCAL_DOMAIN`. */
   const wsProtocol = protocol === 'http:' ? 'ws:' : 'wss:';

src/controllers/api/pleroma.ts

@@ -1,3 +1,4 @@
+import { NSchema as n } from '@nostrify/nostrify';
 import { z } from 'zod';
 
 import { type AppController } from '@/app.ts';
@@ -6,7 +7,6 @@ import { configSchema, elixirTupleSchema, type PleromaConfig } from '@/schemas/p
 import { AdminSigner } from '@/signers/AdminSigner.ts';
 import { Storages } from '@/storages.ts';
 import { createAdminEvent } from '@/utils/api.ts';
-import { jsonSchema } from '@/schema.ts';
 
 const frontendConfigController: AppController = async (c) => {
   const configs = await getConfigs(c.req.raw.signal);
@@ -75,7 +75,7 @@ async function getConfigs(signal: AbortSignal): Promise<PleromaConfig[]> {
 
   try {
     const decrypted = await new AdminSigner().nip44.decrypt(Conf.pubkey, event.content);
-    return jsonSchema.pipe(configSchema.array()).catch([]).parse(decrypted);
+    return n.json().pipe(configSchema.array()).catch([]).parse(decrypted);
   } catch (_e) {
     return [];
   }

src/controllers/api/search.ts

@@ -1,10 +1,9 @@
-import { NostrEvent, NostrFilter } from '@nostrify/nostrify';
+import { NostrEvent, NostrFilter, NSchema as n } from '@nostrify/nostrify';
 import { nip19 } from 'nostr-tools';
 import { z } from 'zod';
 
 import { AppController } from '@/app.ts';
 import { booleanParamSchema } from '@/schema.ts';
-import { nostrIdSchema } from '@/schemas/nostr.ts';
 import { Storages } from '@/storages.ts';
 import { dedupeEvents } from '@/utils.ts';
 import { nip05Cache } from '@/utils/nip05.ts';
@@ -20,7 +19,7 @@ const searchQuerySchema = z.object({
   type: z.enum(['accounts', 'statuses', 'hashtags']).optional(),
   resolve: booleanParamSchema.optional().transform(Boolean),
   following: z.boolean().default(false),
-  account_id: nostrIdSchema.optional(),
+  account_id: n.id().optional(),
   limit: z.coerce.number().catch(20).transform((value) => Math.min(Math.max(value, 0), 40)),
 });
 

src/controllers/api/statuses.ts

@@ -1,4 +1,4 @@
-import { NIP05, NostrEvent, NostrFilter } from '@nostrify/nostrify';
+import { NIP05, NostrEvent, NostrFilter, NSchema as n } from '@nostrify/nostrify';
 import ISO6391 from 'iso-639-1';
 import { nip19 } from 'nostr-tools';
 import { z } from 'zod';
@@ -7,7 +7,6 @@ import { type AppController } from '@/app.ts';
 import { Conf } from '@/config.ts';
 import { getUnattachedMediaByIds } from '@/db/unattached-media.ts';
 import { getAncestors, getAuthor, getDescendants, getEvent } from '@/queries.ts';
-import { jsonMetaContentSchema } from '@/schemas/nostr.ts';
 import { addTag, deleteTag } from '@/tags.ts';
 import { createEvent, paginationSchema, parseBody, updateListEvent } from '@/utils/api.ts';
 import { renderEventAccounts } from '@/views.ts';
@@ -406,7 +405,7 @@ const zapController: AppController = async (c) => {
 
   const target = await getEvent(id, { kind: 1, relations: ['author', 'event_stats', 'author_stats'], signal });
   const author = target?.author;
-  const meta = jsonMetaContentSchema.parse(author?.content);
+  const meta = n.json().pipe(n.metadata()).parse(author?.content);
   const lnurl = getLnurl(meta);
 
   if (target && lnurl) {

src/controllers/nostr/relay-info.ts

@@ -1,12 +1,14 @@
+import { NSchema as n } from '@nostrify/nostrify';
+
 import { AppController } from '@/app.ts';
 import { Conf } from '@/config.ts';
-import { jsonServerMetaSchema } from '@/schemas/nostr.ts';
+import { serverMetaSchema } from '@/schemas/nostr.ts';
 import { Storages } from '@/storages.ts';
 
 const relayInfoController: AppController = async (c) => {
   const { signal } = c.req.raw;
   const [event] = await Storages.db.query([{ kinds: [0], authors: [Conf.pubkey], limit: 1 }], { signal });
-  const meta = jsonServerMetaSchema.parse(event?.content);
+  const meta = n.json().pipe(serverMetaSchema).parse(event?.content);
 
   return c.json({
     name: meta.name ?? 'Ditto',

src/controllers/nostr/relay.ts

@@ -1,14 +1,15 @@
-import { NostrEvent, NostrFilter, NSchema as n } from '@nostrify/nostrify';
+import {
+  NostrClientCLOSE,
+  NostrClientCOUNT,
+  NostrClientEVENT,
+  NostrClientMsg,
+  NostrClientREQ,
+  NostrEvent,
+  NostrFilter,
+  NSchema as n,
+} from '@nostrify/nostrify';
 import { relayInfoController } from '@/controllers/nostr/relay-info.ts';
 import * as pipeline from '@/pipeline.ts';
-import {
-  type ClientCLOSE,
-  type ClientCOUNT,
-  type ClientEVENT,
-  type ClientMsg,
-  clientMsgSchema,
-  type ClientREQ,
-} from '@/schemas/nostr.ts';
 import { Storages } from '@/storages.ts';
 
 import type { AppController } from '@/app.ts';
@@ -30,7 +31,7 @@ function connectStream(socket: WebSocket) {
   const controllers = new Map<string, AbortController>();
 
   socket.onmessage = (e) => {
-    const result = n.json().pipe(clientMsgSchema).safeParse(e.data);
+    const result = n.json().pipe(n.clientMsg()).safeParse(e.data);
     if (result.success) {
       handleMsg(result.data);
     } else {
@@ -45,7 +46,7 @@ function connectStream(socket: WebSocket) {
   };
 
   /** Handle client message. */
-  function handleMsg(msg: ClientMsg) {
+  function handleMsg(msg: NostrClientMsg) {
     switch (msg[0]) {
       case 'REQ':
         handleReq(msg);
@@ -63,7 +64,7 @@ function connectStream(socket: WebSocket) {
   }
 
   /** Handle REQ. Start a subscription. */
-  async function handleReq([_, subId, ...rest]: ClientREQ): Promise<void> {
+  async function handleReq([_, subId, ...rest]: NostrClientREQ): Promise<void> {
     const filters = prepareFilters(rest);
 
     const controller = new AbortController();
@@ -88,7 +89,7 @@ function connectStream(socket: WebSocket) {
   }
 
   /** Handle EVENT. Store the event. */
-  async function handleEvent([_, event]: ClientEVENT): Promise<void> {
+  async function handleEvent([_, event]: NostrClientEVENT): Promise<void> {
     try {
       // This will store it (if eligible) and run other side-effects.
       await pipeline.handleEvent(event, AbortSignal.timeout(1000));
@@ -104,7 +105,7 @@ function connectStream(socket: WebSocket) {
   }
 
   /** Handle CLOSE. Close the subscription. */
-  function handleClose([_, subId]: ClientCLOSE): void {
+  function handleClose([_, subId]: NostrClientCLOSE): void {
     const controller = controllers.get(subId);
     if (controller) {
       controller.abort();
@@ -113,7 +114,7 @@ function connectStream(socket: WebSocket) {
   }
 
   /** Handle COUNT. Return the number of events matching the filters. */
-  async function handleCount([_, subId, ...rest]: ClientCOUNT): Promise<void> {
+  async function handleCount([_, subId, ...rest]: NostrClientCOUNT): Promise<void> {
     const { count } = await Storages.db.count(prepareFilters(rest));
     send(['COUNT', subId, { count, approximate: false }]);
   }
@@ -127,7 +128,7 @@ function connectStream(socket: WebSocket) {
 }
 
 /** Enforce the filters with certain criteria. */
-function prepareFilters(filters: ClientREQ[2][]): NostrFilter[] {
+function prepareFilters(filters: NostrClientREQ[2][]): NostrFilter[] {
   return filters.map((filter) => {
     const narrow = Boolean(filter.ids?.length || filter.authors?.length);
     const search = narrow ? filter.search : `domain:${Conf.url.host} ${filter.search ?? ''}`;