mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: return zod errors in publicTimelineController

Browse source
This commit is contained in:
P. Reis 2024-09-25 16:52:54 -03:00
parent 12aaf8c678
commit 77f5965cdc
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/controllers/api/timelines.ts
View file

@ -1,11 +1,10 @@
import ISO6391 from 'iso-639-1';
import { NostrFilter } from '@nostrify/nostrify'; import { NostrFilter } from '@nostrify/nostrify';
import { z } from 'zod'; import { z } from 'zod';
import { type AppContext, type AppController } from '@/app.ts'; import { type AppContext, type AppController } from '@/app.ts';
import { Conf } from '@/config.ts'; import { Conf } from '@/config.ts';
import { getFeedPubkeys } from '@/queries.ts'; import { getFeedPubkeys } from '@/queries.ts';
import { booleanParamSchema } from '@/schema.ts'; import { booleanParamSchema, languageSchema } from '@/schema.ts';
import { hydrateEvents } from '@/storages/hydrate.ts'; import { hydrateEvents } from '@/storages/hydrate.ts';
import { paginated } from '@/utils/api.ts'; import { paginated } from '@/utils/api.ts';
import { getTagSet } from '@/utils/tags.ts'; import { getTagSet } from '@/utils/tags.ts';
@ -19,36 +18,37 @@ const homeTimelineController: AppController = async (c) => {
}; };
const publicQuerySchema = z.object({ const publicQuerySchema = z.object({
local: booleanParamSchema.catch(false), local: booleanParamSchema.default('false'),
instance: z.string().optional().catch(undefined), instance: z.string().optional(),
language: z.string().max(2).transform((val, ctx) => { language: languageSchema.optional(),
if (!ISO6391.validate(val)) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: 'Not a valid language in ISO-639-1 format',
});
return z.NEVER;
}
return val;
}).optional().catch(undefined),
}); });
const publicTimelineController: AppController = (c) => { const publicTimelineController: AppController = (c) => {
const params = c.get('pagination'); const params = c.get('pagination');
const { local, instance, language } = publicQuerySchema.parse(c.req.query()); const result = publicQuerySchema.safeParse(c.req.query());
if (!result.success) {
return c.json({ error: 'Bad request', schema: result.error }, 400);
}
const { local, instance, language } = result.data;
const filter: NostrFilter = { kinds: [1], ...params }; const filter: NostrFilter = { kinds: [1], ...params };
const search: `${string}:${string}`[] = [];
if (local) { if (local) {
filter.search = `domain:${Conf.url.host}`; search.push(`domain:${Conf.url.host}`);
} else if (instance) { } else if (instance) {
filter.search = `domain:${instance}`; search.push(`domain:${instance}`);
} }
if (language) { if (language) {
filter.search = filter.search + ' ' + `language:${language}`; search.push(`language:${language}`);
} }
filter.search = search.join(' ');
return renderStatuses(c, [filter]); return renderStatuses(c, [filter]);
}; };