Support pagination on user profile
This commit is contained in:
parent
75a7a0a2ff
commit
8a62cb604d
|
@ -2,7 +2,7 @@ import { type AppController } from '@/app.ts';
|
||||||
import { z } from '@/deps.ts';
|
import { z } from '@/deps.ts';
|
||||||
import { getAuthor, getFilter, getFollows } from '@/client.ts';
|
import { getAuthor, getFilter, getFollows } from '@/client.ts';
|
||||||
import { toAccount, toStatus } from '@/transmute.ts';
|
import { toAccount, toStatus } from '@/transmute.ts';
|
||||||
import { eventDateComparator, lookupAccount } from '@/utils.ts';
|
import { buildLinkHeader, eventDateComparator, lookupAccount, paginationSchema } from '@/utils.ts';
|
||||||
|
|
||||||
const verifyCredentialsController: AppController = async (c) => {
|
const verifyCredentialsController: AppController = async (c) => {
|
||||||
const pubkey = c.get('pubkey')!;
|
const pubkey = c.get('pubkey')!;
|
||||||
|
@ -91,6 +91,7 @@ const accountStatusesQuerySchema = z.object({
|
||||||
|
|
||||||
const accountStatusesController: AppController = async (c) => {
|
const accountStatusesController: AppController = async (c) => {
|
||||||
const pubkey = c.req.param('pubkey');
|
const pubkey = c.req.param('pubkey');
|
||||||
|
const { since, until } = paginationSchema.parse(c.req.query());
|
||||||
const { pinned, limit } = accountStatusesQuerySchema.parse(c.req.query());
|
const { pinned, limit } = accountStatusesQuerySchema.parse(c.req.query());
|
||||||
|
|
||||||
// Nostr doesn't support pinned statuses.
|
// Nostr doesn't support pinned statuses.
|
||||||
|
@ -98,10 +99,11 @@ const accountStatusesController: AppController = async (c) => {
|
||||||
return c.json([]);
|
return c.json([]);
|
||||||
}
|
}
|
||||||
|
|
||||||
const events = (await getFilter({ authors: [pubkey], kinds: [1], limit })).sort(eventDateComparator);
|
const events = (await getFilter({ authors: [pubkey], kinds: [1], since, until, limit })).sort(eventDateComparator);
|
||||||
const statuses = await Promise.all(events.map((event) => toStatus(event)));
|
const statuses = await Promise.all(events.map((event) => toStatus(event)));
|
||||||
|
|
||||||
return c.json(statuses);
|
const link = buildLinkHeader(c.req.url, events);
|
||||||
|
return c.json(statuses, 200, link ? { link } : undefined);
|
||||||
};
|
};
|
||||||
|
|
||||||
export {
|
export {
|
||||||
|
|
|
@ -1,13 +1,11 @@
|
||||||
import { type AppController } from '@/app.ts';
|
|
||||||
import { getFeed, getFollows } from '@/client.ts';
|
import { getFeed, getFollows } from '@/client.ts';
|
||||||
import { LOCAL_DOMAIN } from '@/config.ts';
|
|
||||||
import { z } from '@/deps.ts';
|
|
||||||
import { toStatus } from '@/transmute.ts';
|
import { toStatus } from '@/transmute.ts';
|
||||||
|
import { buildLinkHeader, paginationSchema } from '@/utils.ts';
|
||||||
|
|
||||||
|
import type { AppController } from '@/app.ts';
|
||||||
|
|
||||||
const homeController: AppController = async (c) => {
|
const homeController: AppController = async (c) => {
|
||||||
const since = paramSchema.parse(c.req.query('since'));
|
const { since, until } = paginationSchema.parse(c.req.query());
|
||||||
const until = paramSchema.parse(c.req.query('until'));
|
|
||||||
|
|
||||||
const pubkey = c.get('pubkey')!;
|
const pubkey = c.get('pubkey')!;
|
||||||
|
|
||||||
const follows = await getFollows(pubkey);
|
const follows = await getFollows(pubkey);
|
||||||
|
@ -22,14 +20,8 @@ const homeController: AppController = async (c) => {
|
||||||
|
|
||||||
const statuses = (await Promise.all(events.map(toStatus))).filter(Boolean);
|
const statuses = (await Promise.all(events.map(toStatus))).filter(Boolean);
|
||||||
|
|
||||||
const next = `${LOCAL_DOMAIN}/api/v1/timelines/home?until=${events[events.length - 1].created_at}`;
|
const link = buildLinkHeader(c.req.url, events);
|
||||||
const prev = `${LOCAL_DOMAIN}/api/v1/timelines/home?since=${events[0].created_at}`;
|
return c.json(statuses, 200, link ? { link } : undefined);
|
||||||
|
|
||||||
return c.json(statuses, 200, {
|
|
||||||
link: `<${next}>; rel="next", <${prev}>; rel="prev"`,
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const paramSchema = z.coerce.number().optional().catch(undefined);
|
|
||||||
|
|
||||||
export { homeController };
|
export { homeController };
|
||||||
|
|
35
src/utils.ts
35
src/utils.ts
|
@ -1,5 +1,6 @@
|
||||||
import { getAuthor } from '@/client.ts';
|
import { getAuthor } from '@/client.ts';
|
||||||
import { nip19, parseFormData } from '@/deps.ts';
|
import { LOCAL_DOMAIN } from '@/config.ts';
|
||||||
|
import { nip19, parseFormData, z } from '@/deps.ts';
|
||||||
import { type Event } from '@/event.ts';
|
import { type Event } from '@/event.ts';
|
||||||
import { lookupNip05Cached } from '@/nip05.ts';
|
import { lookupNip05Cached } from '@/nip05.ts';
|
||||||
|
|
||||||
|
@ -75,4 +76,34 @@ async function parseBody(req: Request): Promise<unknown> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export { bech32ToPubkey, eventDateComparator, lookupAccount, type Nip05, nostrNow, parseBody, parseNip05 };
|
const paginationSchema = z.object({
|
||||||
|
since: z.coerce.number().optional().catch(undefined),
|
||||||
|
until: z.coerce.number().optional().catch(undefined),
|
||||||
|
});
|
||||||
|
|
||||||
|
function buildLinkHeader(url: string, events: Event[]): string | undefined {
|
||||||
|
if (!events.length) return;
|
||||||
|
const firstEvent = events[0];
|
||||||
|
const lastEvent = events[events.length - 1];
|
||||||
|
|
||||||
|
const { pathname, search } = new URL(url);
|
||||||
|
const next = new URL(pathname + search, LOCAL_DOMAIN);
|
||||||
|
const prev = new URL(pathname + search, LOCAL_DOMAIN);
|
||||||
|
|
||||||
|
next.searchParams.set('until', String(lastEvent.created_at));
|
||||||
|
prev.searchParams.set('since', String(firstEvent.created_at));
|
||||||
|
|
||||||
|
return `<${next}>; rel="next", <${prev}>; rel="prev"`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export {
|
||||||
|
bech32ToPubkey,
|
||||||
|
buildLinkHeader,
|
||||||
|
eventDateComparator,
|
||||||
|
lookupAccount,
|
||||||
|
type Nip05,
|
||||||
|
nostrNow,
|
||||||
|
paginationSchema,
|
||||||
|
parseBody,
|
||||||
|
parseNip05,
|
||||||
|
};
|
||||||
|
|
Loading…
Reference in New Issue