aljaz/ditto
1
0
Fork 0
mirror of https://github.com/aljazceru/ditto.git synced 2026-01-06 23:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add paginated helper function, DRY pagination code

Browse Source
This commit is contained in:
Alex Gleason
2023-08-29 12:55:00 -05:00
parent ce4a330812
commit 4216a7931a
4 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/controllers/api/accounts.ts
View File

@@ -6,7 +6,7 @@ import { booleanParamSchema } from '@/schema.ts';
import { jsonMetaContentSchema } from '@/schemas/nostr.ts';
import { toAccount, toRelationship, toStatus } from '@/transformers/nostr-to-mastoapi.ts';
import { eventDateComparator, isFollowing, lookupAccount } from '@/utils.ts';
import { buildLinkHeader, paginationSchema, parseBody } from '@/utils/web.ts';
import { paginated, paginationSchema, parseBody } from '@/utils/web.ts';
import { createEvent } from '@/utils/web.ts';
const createAccountController: AppController = (c) => {
@@ -110,9 +110,7 @@ const accountStatusesController: AppController = async (c) => {
}
const statuses = await Promise.all(events.map(toStatus));
const link = buildLinkHeader(c.req.url, events);
return c.json(statuses, 200, link ? { link } : undefined);
return paginated(c, events, statuses);
};
const fileSchema = z.custom<File>((value) => value instanceof File);

6
src/controllers/api/notifications.ts
View File

@@ -1,6 +1,6 @@
import { type AppController } from '@/app.ts';
import * as mixer from '@/mixer.ts';
import { buildLinkHeader, paginationSchema } from '@/utils/web.ts';
import { paginated, paginationSchema } from '@/utils/web.ts';
import { toNotification } from '@/transformers/nostr-to-mastoapi.ts';
import { Time } from '@/utils.ts';
@@ -14,9 +14,7 @@ const notificationsController: AppController = async (c) => {
);
const statuses = await Promise.all(events.map(toNotification));
const link = buildLinkHeader(c.req.url, events);
return c.json(statuses, 200, link ? { link } : undefined);
return paginated(c, events, statuses);
};
export { notificationsController };

20
src/controllers/api/timelines.ts
View File

@@ -3,7 +3,7 @@ import * as mixer from '@/mixer.ts';
import { getFeed, getPublicFeed } from '@/queries.ts';
import { booleanParamSchema } from '@/schema.ts';
import { toStatus } from '@/transformers/nostr-to-mastoapi.ts';
import { buildLinkHeader, paginationSchema } from '@/utils/web.ts';
import { paginated, paginationSchema } from '@/utils/web.ts';
import { Time } from '@/utils.ts';
import type { AppController } from '@/app.ts';
@@ -17,10 +17,8 @@ const homeTimelineController: AppController = async (c) => {
return c.json([]);
}
const statuses = (await Promise.all(events.map(toStatus))).filter(Boolean);
const link = buildLinkHeader(c.req.url, events);
return c.json(statuses, 200, link ? { link } : undefined);
const statuses = await Promise.all(events.map(toStatus));
return paginated(c, events, statuses);
};
const publicQuerySchema = z.object({
@@ -36,10 +34,8 @@ const publicTimelineController: AppController = async (c) => {
return c.json([]);
}
const statuses = (await Promise.all(events.map(toStatus))).filter(Boolean);
const link = buildLinkHeader(c.req.url, events);
return c.json(statuses, 200, link ? { link } : undefined);
const statuses = await Promise.all(events.map(toStatus));
return paginated(c, events, statuses);
};
const hashtagTimelineController: AppController = async (c) => {
@@ -55,10 +51,8 @@ const hashtagTimelineController: AppController = async (c) => {
return c.json([]);
}
const statuses = (await Promise.all(events.map(toStatus))).filter(Boolean);
const link = buildLinkHeader(c.req.url, events);
return c.json(statuses, 200, link ? { link } : undefined);
const statuses = await Promise.all(events.map(toStatus));
return paginated(c, events, statuses);
};
export { hashtagTimelineController, homeTimelineController, publicTimelineController };